Update to Alien's ARM which allows XFCE to run on an ARM ChromeBook.

This large update brings Alien's ARM repository almost to the same level
of package versions in slackware-current. THese updates were needed to
make it possible to start a functional XFCE session on Samsung's ARM
ChromeBook (XE303C12).

1887 files changed, 31418 insertions, 8899 deletions

diff --git a/source.local/a/btrfs-progs/btrfs-progs.SlackBuild b/source.local/a/btrfs-progs/btrfs-progs.SlackBuild
index 5c0406e..bb17807 100755
--- a/source.local/a/btrfs-progs/btrfs-progs.SlackBuild
+++ b/source.local/a/btrfs-progs/btrfs-progs.SlackBuild
@@ -27,13 +27,13 @@ BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Download the btrfs-progs-unstable Git head if there's no tarball:
+# Download the btrfs-progs Git head if there's no tarball:
 if ! /bin/ls $CWD/btrfs-progs*tar* 1> /dev/null 2> /dev/null ; then
-  git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git
-  rm -r btrfs-progs-unstable/.git
-  tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs-unstable
+  git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
+  rm -r btrfs-progs/.git
+  tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs
   xz -9 btrfs-progs-$(date +%Y%m%d).tar
-  rm -r $CWD/btrfs-progs-unstable
+  rm -r $CWD/btrfs-progs
 fi
 
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -f 3 -d - | cut -f 1 -d .)}
@@ -58,9 +58,9 @@ rm -rf $PKG
 mkdir -p $PKG
 
 cd $TMP
-rm -rf btrfs-progs-unstable
+rm -rf btrfs-progs
 tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd btrfs-progs-unstable
+cd btrfs-progs
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -79,9 +79,6 @@ find . -perm 555 -exec chmod 755 {} \;
 # Build:
 make $NUMJOBS || make || exit 1
 
-# Build ext* conversion utility:
-make $NUMJOBS convert || make convert || exit 1
-
 # Install:
 make install DESTDIR=$PKG || exit 1
 
diff --git a/source.local/a/btrfs-progs/slack-desc b/source.local/a/btrfs-progs/slack-desc
index e9088d0..d53953c 100644
--- a/source.local/a/btrfs-progs/slack-desc
+++ b/source.local/a/btrfs-progs/slack-desc
@@ -11,9 +11,9 @@ btrfs-progs:
 btrfs-progs: Btrfs is a new copy on write filesystem for Linux aimed at implementing
 btrfs-progs: advanced features while focusing on fault tolerance, repair and easy
 btrfs-progs: administration.  Initially developed by Oracle, Btrfs is licensed under
-btrfs-progs: the GPL and open for contribution from anyone.  Btrfs is under heavy
-btrfs-progs: development, and is not suitable for any uses other than benchmarking
-btrfs-progs: and review.  The Btrfs disk format is not yet finalized.
+btrfs-progs: the GPL and open for contribution from anyone.
+btrfs-progs:
+btrfs-progs:
 btrfs-progs:
 btrfs-progs: Btrfs homepage:  http://btrfs.wiki.kernel.org
 btrfs-progs:
diff --git a/source.local/a/coreutils/coreutils-8.15.tar.xz.sig b/source.local/a/coreutils/coreutils-8.15.tar.xz.sig
deleted file mode 100644
index f019a30..0000000
--- a/source.local/a/coreutils/coreutils-8.15.tar.xz.sig
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iQIcBAABCAAGBQJPBzBcAAoJEH/Z/MsAC+7uGakP/imRzsO4NBqt0TKCiEY9mEKF
-DdLmg86yj9XjySySa+rQwtNZCv0fi3LfYktiozXtP7kr/S8bGTHR3zD3uW6I6zU1
-fmV7zndut6uC1KR2XlQLLxDwYQAbCaV0XHV4Ml+Qc+aFoQPgepwqD4svyTnZ+pXV
-tN/RZXVPVlr0EOvolgwMnigVkmrwp1uklr9MsRclp2AZZttjWKMq3tajtVXg0T6m
-KdCdVkUx5Dcfvaxy9405WXx2VXTzP95CT57a//aNfHtSe36PzvhKc/S6Hl7Wp3vQ
-4+5Jhm97N9wppmndHBtnJH9Ev2xQgHr1jnbQjGFbygeUSH4YX4QAcSkBuWFSV+jw
-A9257ON3/khngEKOgM9D/PfosHaL040w7kyTDOCUkFsIdZSwQ6bdYH6Z6sasbFPj
-zqzz8gPa4rOHxLQHMFMDEbq5h5FxHg/qYHROuQ33X0SX+mSykOZ2/oDVAtt3APIU
-CKmonLM5TD0/84cWwW9Sy1oJgIDRUIBnpNDk4Ne12LUCrbdEvFhe4P1s3+Gq/EM9
-rTyjA+GcirEbR2HWO8+CVe7df+IJ0oyX1PrHi3xFgnLZnLisdN9SHyJc+vBHH0qi
-NKhWRF7fmvHR6Okss91sqoRwl9NYX8TOe+sV6wgxm0V1nzjP9h4Yhq2r80MMkxoB
-EMPcigpqXK64LJvbfeCQ
-=bS2F
------END PGP SIGNATURE-----
diff --git a/source.local/a/coreutils/coreutils-8.21.tar.xz.sig b/source.local/a/coreutils/coreutils-8.21.tar.xz.sig
new file mode 100644
index 0000000..234234c
--- /dev/null
+++ b/source.local/a/coreutils/coreutils-8.21.tar.xz.sig
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJRHRj2AAoJEN9v2XEwYDfZufwQALRKT3u/LTG0yYC/0dyPTy85
+scOjACTtN0ilzhwRozCFgipZzmKo6WwRdh7y3qRko/8BCExH4ahWcM6wcIwV7Rr/
+kihbc8jiLzZjAvP6jVEDcHzAF69FaHHCcsxUZ48QDYjvXQupRJ8v0jFO3paUvWoj
+1G2WHNNfdqZf5B29yEsueHvwri/eQexzEWCpr5dfRekaYp50ifTkmyNs8A0rpKE+
+9pRscmulcmAjNlSPj1axKoBRa+w2M/r4nCQQdQy/xD33HyhZHemQaI3iMHYTJ3y1
+zfnR5ACkxLtSY+keOrhda+0Q0tpP0Uh7Rh+NrOWIXZfiDd3g9AiIFB3ra58mW0jT
+pcTyQ5o+v/AIMdJlH1ASLiMmGhY86/46QZ3sPr73RvJeX7p1Hc41Y6Xmgi36dDAA
+gbWZ8GXGTvcMa4IeIZ8n0hEwaWAo33/PoUmNxkn/+isLsjW9i0ordST/rXd7XMPc
+p9+iYnMyeFHHJx89hJTwmAnKYOTWKUc7p8A7DsVtKdBDKI9vDF7vOHjSyvDDyIze
+PIK52g4lyIKAGWjtKfnumBqT1PVMS46afUl1WdbT0lceevpcWBmbV1g0biZHeaQF
+6PMbJ2M29+QEQtZN7f84h0OKDAWxRjae6DZLOa+hTVeqBqyyN2VJRYDbXSPtvW2z
+fRHUrw/zzqrKOCaqm12b
+=/lmg
+-----END PGP SIGNATURE-----
diff --git a/source.local/a/coreutils/coreutils.SlackBuild b/source.local/a/coreutils/coreutils.SlackBuild
index 46c54b4..e06a85c 100755
--- a/source.local/a/coreutils/coreutils.SlackBuild
+++ b/source.local/a/coreutils/coreutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,48 +24,48 @@
 
 
 PKGNAM=coreutils
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+VERSION=${VERSION:-8.21}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-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"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  elif [ "$ARCH" = "arm" ]; then
+    SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+    LIBDIRSUFFIX=""
+  elif [ "$ARCH" = "armel" ]; then
+    SLKCFLAGS="-O2 -march=armv4t"
+    LIBDIRSUFFIX=""
+  elif [ "$ARCH" = "armv7hl" ]; then
+    SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+    LIBDIRSUFFIX=""
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -73,6 +73,10 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -108,12 +112,13 @@ fi
 
 # Compilation with glibc version later than 2.3.2 needs the environment
 # variable DEFAULT_POSIX2_VERSION set to 199209.
-# Without the next line, the coreutils will start complaining about 'obsolete'
+# Without that line, the coreutils will start complaining about 'obsolete'
 # command switches, like "tail -20" will be considered obsolete.
 # This behaviour breaks many other packages... the 'obsolete' parameters are
 # too commonly used to disregard them.  Better to stick with the older more
 # widely accepted standards until things begin to demand the new way.
 
+FORCE_UNSAFE_CONFIGURE=1 \
 CFLAGS="$SLKCFLAGS" \
 DEFAULT_POSIX2_VERSION=199209 \
 ./configure \
@@ -182,10 +187,20 @@ done
 ( cd $PKG/usr/bin ; ln -sf ../../bin/ginstall ginstall )
 ( cd $PKG/usr/man/man1 ; ln -sf install.1 ginstall.1 )
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
diff --git a/source.local/a/cups/cups.SlackBuild b/source.local/a/cups/cups.SlackBuild
index 326e167..70e45b7 100755
--- a/source.local/a/cups/cups.SlackBuild
+++ b/source.local/a/cups/cups.SlackBuild
@@ -26,7 +26,7 @@
 
 
 PKGNAM=cups
-VERSION=1.4.8
+VERSION=1.5.4
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -66,11 +66,9 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION-source.tar.?z* || exit 1
 cd $PKGNAM-$VERSION
 
-# Fix the USB backend to use either usblp or libusb:
-zcat $CWD/usb-backend-both-usblp-and-libusb.dpatch.gz | patch -p1 --verbose || exit 1
-
-# Fix locking to avoid crashes with OpenSSL:
-zcat $CWD/cups.fix_broken_locking.diff.gz | patch -p1 --verbose || exit 1
+# Fix for CUPS 1.5.4.  Don't reload the obsolete usblp module, as this
+# can cause partial printing with certain printers.
+zcat $CWD/usb-backend-reset-after-job-only-for-specific-devices.patch.gz | patch -p0 --verbose || exit 1
 
 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure
 ./configure \
@@ -89,6 +87,9 @@ mkdir -p $PKG/etc/cups
 mkdir -p $PKG/var/spool
 make BUILDROOT=$PKG install || exit 1
 
+# Hey, what's with the gigantic test files?  Bloat is bad.
+rm -f $PKG/usr/share/cups/ipptool/*.{pdf,ps,jpg}
+
 # I've added so many things like /etc/init.d/ to Slackware that CUPS
 # is now installing init scripts to the Red Hat locations.  We'll move
 # them to the usual locations:
@@ -99,17 +100,6 @@ chmod 644 $PKG/etc/rc.d/rc.cups.new
 # Clear out the additions:
 rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d
 
-### OBSOLETE.  The USB backend is patched to support usblp again. ###
-## From 1.4.x, CUPS no longer uses usblp, and having the module loaded
-## will interfere with USB printers.  So, we will add a blacklist rule
-## so that the module is not loaded:
-#mkdir -p $PKG/etc/modprobe.d
-#cat << EOF > $PKG/etc/modprobe.d/cups.blacklist.usblp.conf.new
-## Do not load the kernel usblp module, since it interferes with
-## versions of CUPS 1.4.0 and newer:
-#blacklist usblp
-#EOF
-
 # I'm not sure if overwriting this blindly could have ill effects,
 # but it never hurts to play it safe.  According to the dbus-daemon
 # manpage, only files ending in .conf will be used, so there won't
diff --git a/source.local/a/cups/cups.fix_broken_locking.diff.gz b/source.local/a/cups/cups.fix_broken_locking.diff.gz
deleted file mode 100644
index 5ed22dd..0000000
--- a/source.local/a/cups/cups.fix_broken_locking.diff.gz
+++ /dev/null
diff --git a/source.local/a/cups/cups.url b/source.local/a/cups/cups.url
new file mode 100644
index 0000000..fc83aeb
--- /dev/null
+++ b/source.local/a/cups/cups.url
@@ -0,0 +1 @@
+http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2
diff --git a/source.local/a/cups/usb-backend-both-usblp-and-libusb.dpatch.gz b/source.local/a/cups/usb-backend-both-usblp-and-libusb.dpatch.gz
deleted file mode 100644
index 4121535..0000000
--- a/source.local/a/cups/usb-backend-both-usblp-and-libusb.dpatch.gz
+++ /dev/null
diff --git a/source.local/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch.gz b/source.local/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch.gz
new file mode 100644
index 0000000..15aa66b
--- /dev/null
+++ b/source.local/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch.gz
diff --git a/source.local/a/dbus/dbus-1.4.x-allow_root_globally.diff.gz b/source.local/a/dbus/dbus-1.4.x-allow_root_globally.diff.gz
deleted file mode 100644
index cfd08bb..0000000
--- a/source.local/a/dbus/dbus-1.4.x-allow_root_globally.diff.gz
+++ /dev/null
diff --git a/source.local/a/dbus/dbus-1.6.x-allow_root_globally.diff.gz b/source.local/a/dbus/dbus-1.6.x-allow_root_globally.diff.gz
new file mode 100644
index 0000000..b4a3a1c
--- /dev/null
+++ b/source.local/a/dbus/dbus-1.6.x-allow_root_globally.diff.gz
diff --git a/source.local/a/dbus/dbus.SlackBuild b/source.local/a/dbus/dbus.SlackBuild
index 3b65fab..e57a9a6 100755
--- a/source.local/a/dbus/dbus.SlackBuild
+++ b/source.local/a/dbus/dbus.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007-2010  Robby Workman, Northport, Alabama, USA
-# Copyright 2007-2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007-2012  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,38 +25,39 @@
 
 
 PKGNAM=dbus
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.6.8}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -82,6 +83,7 @@ find . \
  -exec chmod 644 {} \;
 
 zcat $CWD/dbus-1.4.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/dbus.set.home.diff.gz | patch -p1 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -93,9 +95,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-doxygen-docs \
   --enable-shared=yes \
   --enable-static=no \
   --enable-inotify \
+  --enable-x11-autolaunch \
   --with-system-pid-file=/var/run/dbus/dbus.pid \
   --with-system-socket=/var/run/dbus/system_bus_socket \
   --with-init-scripts=slackware \
@@ -107,8 +111,20 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 # Install a custom init script for dbus - the included one is not good for us
 rm $PKG/etc/rc.d/*
@@ -125,6 +141,14 @@ cp -a \
   $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \;
 
+# 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.local/a/dbus/dbus.set.home.diff.gz b/source.local/a/dbus/dbus.set.home.diff.gz
new file mode 100644
index 0000000..930922b
--- /dev/null
+++ b/source.local/a/dbus/dbus.set.home.diff.gz
diff --git a/source.local/a/dbus/rc.messagebus.gz b/source.local/a/dbus/rc.messagebus.gz
index 7f85135..4d61070 100644
--- a/source.local/a/dbus/rc.messagebus.gz
+++ b/source.local/a/dbus/rc.messagebus.gz
diff --git a/source.local/a/gdisk/gdisk.SlackBuild b/source.local/a/gdisk/gdisk.SlackBuild
deleted file mode 100755
index 32cb7bd..0000000
--- a/source.local/a/gdisk/gdisk.SlackBuild
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2011  Eric Hameleers, Eindhoven, NL
-# Copyright 2011  Patrick J. Volkerding, Sebeka, Minnesota, 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.
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
-PKGNAM=gdisk
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$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 {} \;
-
-export LDFLAGS="$SLKLDFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export CFLAGS="$SLKCFLAGS"
-make || exit 1
-
-# Manually install the stuff:
-for FILE in gdisk sgdisk ; do
-  install -D $FILE $PKG/sbin/$FILE
-  install -D $FILE.8 $PKG/usr/man/man8/$FILE.8
-done
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  COPYING* NEWS README* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-# Compress and if needed symlink the man pages:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source.local/a/gdisk/slack-desc b/source.local/a/gdisk/slack-desc
deleted file mode 100644
index 492b446..0000000
--- a/source.local/a/gdisk/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------------------------------------------------------|
-gdisk: gdisk (GPT fdisk)
-gdisk:
-gdisk: GPT fdisk (gdisk) is a partitioning tool for disks using a GPT (GUID
-gdisk: Partition Table).  It features a command-line interface, fairly direct
-gdisk: manipulation of partition table structures, recovery tools to help
-gdisk: you deal with corrupt partition tables, and the ability to convert
-gdisk: MBR disks to GPT format.
-gdisk:
-gdisk:
-gdisk: gdisk home: http://www.rodsbooks.com/gdisk/
-gdisk:
diff --git a/source.local/a/gptfdisk/gptfdisk.SlackBuild b/source.local/a/gptfdisk/gptfdisk.SlackBuild
new file mode 100755
index 0000000..2277729
--- /dev/null
+++ b/source.local/a/gptfdisk/gptfdisk.SlackBuild
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+# Copyright 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=gptfdisk
+VERSION=${VERSION:-0.8.5}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+# Remove dependency on icu4c by switching from the uncommented Makefile
+# lines to the commented ones:
+zcat $CWD/gptfdisk.remove.icu4c.dep.diff.gz | patch -p1 || 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 {} \;
+
+export LDFLAGS="$SLKLDFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+export CFLAGS="$SLKCFLAGS"
+if [ "$ARCH" = "armv7hl" ]; then
+  export LDFLAGS="-ltinfo $LDFLAGS"
+fi
+
+make || exit 1
+
+# Manually install the stuff:
+for FILE in cgdisk fixparts gdisk sgdisk ; do
+  install -D $FILE $PKG/sbin/$FILE
+  install -D $FILE.8 $PKG/usr/man/man8/$FILE.8
+done
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING* NEWS README* \
+  gdisk_test.sh \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff.gz b/source.local/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff.gz
new file mode 100644
index 0000000..2d22162
--- /dev/null
+++ b/source.local/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff.gz
diff --git a/source.local/a/gptfdisk/slack-desc b/source.local/a/gptfdisk/slack-desc
new file mode 100644
index 0000000..913fd87
--- /dev/null
+++ b/source.local/a/gptfdisk/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 ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+gptfdisk: gptfdisk (GPT fdisk utilities)
+gptfdisk:
+gptfdisk: GPT fdisk (consisting of the gdisk, cgdisk, sgdisk, and fixparts
+gptfdisk: programs) is a set of text-mode partitioning tools for using a GPT
+gptfdisk: (GUID Partition Table), rather than the traditional MBR (Master Boot
+gptfdisk: Record) partition tables.  It features several partitioning tools,
+gptfdisk: recovery tools to help you deal with corrupt partition tables, and the
+gptfdisk: ability to convert MBR disks to GPT format.
+gptfdisk:
+gptfdisk: gdisk home: http://www.rodsbooks.com/gdisk/
+gptfdisk:
diff --git a/source.local/a/libcgroup/libcgroup.SlackBuild b/source.local/a/libcgroup/libcgroup.SlackBuild
index 1c5bc68..fe79ac8 100755
--- a/source.local/a/libcgroup/libcgroup.SlackBuild
+++ b/source.local/a/libcgroup/libcgroup.SlackBuild
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libcgroup
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.38}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/a/libcgroup/libcgroup.init.diff.gz b/source.local/a/libcgroup/libcgroup.init.diff.gz
index 75e1a12..b0ed9f1 100644
--- a/source.local/a/libcgroup/libcgroup.init.diff.gz
+++ b/source.local/a/libcgroup/libcgroup.init.diff.gz
diff --git a/source.local/a/minicom/minicom.SlackBuild b/source.local/a/minicom/minicom.SlackBuild
index 01facaf..451eb59 100755
--- a/source.local/a/minicom/minicom.SlackBuild
+++ b/source.local/a/minicom/minicom.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,37 +24,39 @@
 
 
 PKGNAM=minicom
-VERSION=2.5
+VERSION=2.6
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -62,13 +64,17 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 # minicom
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xzvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION
 
 # The following command renames the internal implementation of getline
@@ -91,7 +97,7 @@ make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/etc
 zcat $CWD/minicom.users.gz > $PKG/etc/minicom.users.new
-printf "# Machine-generated file - use "minicom -s" to change parameters.\n" \
+printf "# Machine-generated file - use \"minicom -s\" to change parameters.\n" \
        > $PKG/etc/minirc.dfl.new
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
@@ -108,10 +114,6 @@ if [ -r ChangeLog ]; then
   touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 
-# lzrz
-# If autotools causes failure here (which it probably will), temporarily 
-# move /usr/bin/auto{conf,header,make} out of the way and it should work... 
-
 cd $TMP
 rm -rf lrzsz-990823
 tar xvf $CWD/lrzsz_0.12.21.orig.tar.gz || exit 1
@@ -131,6 +133,9 @@ for i in debian/patches/* ; do patch -p1 < $i || exit 1 ; done
   --mandir=/usr/man \
   --build=$TARGET
 
+touch stamp-h.in # to stop autoheader from running
+touch -d yesterday aclocal.m4 # to stop automake from running
+
 make $NUMJOBS || make || exit 1
 
 cp src/lrz src/lsz $PKG/usr/bin
diff --git a/source.local/a/ntfs-3g/99-ntfs-3g.rules b/source.local/a/ntfs-3g/99-ntfs-3g.rules
new file mode 100644
index 0000000..c27c3cb
--- /dev/null
+++ b/source.local/a/ntfs-3g/99-ntfs-3g.rules
@@ -0,0 +1,2 @@
+# Use ntfs-3g rather than regular ntfs for devices detected through udev:
+ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs-3g"
diff --git a/source.local/a/ntfs-3g/ntfs-3g.SlackBuild b/source.local/a/ntfs-3g/ntfs-3g.SlackBuild
index c4a78ba..184f4c2 100755
--- a/source.local/a/ntfs-3g/ntfs-3g.SlackBuild
+++ b/source.local/a/ntfs-3g/ntfs-3g.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for ntfs-3g
 
 # Copyright 2008  Antonio Hernandez Blas <hba.nihilismus@gmail.com>
+# Copyright 2012  Patrick J. Volkerding, Sebeka, MN, USA
+
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,38 +30,40 @@
 
 
 PKGNAM=ntfs-3g
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=2012.1.15
+BUILD=${BUILD:-2}
 
+SRCNAM=ntfs-3g_ntfsprogs
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -74,9 +78,9 @@ PKG=$TMP/package-$PKGNAM
 rm -rf $PKG 
 mkdir -p $TMP $PKG
 cd $TMP || exit 1
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -102,17 +106,45 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# I hate to do this (it worked without it before), but recently /bin/ntfs-3g
+# ceased to work for non-root users unless it is setuid root.  If anyone has
+# any better ideas, I'd like to hear them.
+chmod 4711 $PKG/bin/ntfs-3g
+
 # Add the HAL fdi file so that automount uses ntfs-3g for mounting
 # This should work with the "volume.fstype.alternative.*" in hal-0.5.12+
 mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor
 cat $CWD/10-ntfs-3g-policy.fdi \
   > $PKG/usr/share/hal/fdi/policy/10osvendor/10-ntfs-3g-policy.fdi
 
+# Create a mount.ntfs -> mount.ntfs-3g symlink.
+# This causes ntfs-3g to always be used when mounting NTFS filesystems.
+# NOTE:  This also seems to make mounting with the old ntfs filesystem
+# impossible.  But does anyone care?
+( cd $PKG/sbin ; ln -s mount.ntfs-3g mount.ntfs )
+
+## Add a udev rule to use ntfs-3g instead of ntfs:
+## (This is not needed if the mount.ntfs symlink is made)
+#mkdir -p $PKG/lib/udev/rules.d
+#cat $CWD/99-ntfs-3g.rules > $PKG/lib/udev/rules.d/99-ntfs-3g.rules
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 rm -rf $PKG/usr/share/doc
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source.local/a/pciutils/pciutils.SlackBuild b/source.local/a/pciutils/pciutils.SlackBuild
index 9edbbcd..7c7b0a9 100755
--- a/source.local/a/pciutils/pciutils.SlackBuild
+++ b/source.local/a/pciutils/pciutils.SlackBuild
@@ -79,7 +79,7 @@ find . \
 zcat $CWD/pciutils.dontcompress.diff.gz | patch -p1 || exit 1
 zcat $CWD/pciutils.update.pci.ids.url.diff.gz | patch -p1 || exit 1
 
-# Make and install the shared library
+# Make the static library
 make \
   PREFIX=/usr \
   SBINDIR=/sbin \
@@ -89,9 +89,28 @@ make \
   PCI_IDS=pci.ids \
   PCI_COMPRESSED_IDS=0 \
   SHARED=no \
+  STRIP="" \
   OPT="$SLKCFLAGS" \
   $NUMJOBS || exit 1
 
+# Make a shared library as well:
+mv lib/libpci.a lib/libpci.a.toinstall
+make clean
+
+make \
+  PREFIX=/usr \
+  SBINDIR=/sbin \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  MANDIR=/usr/man \
+  IDSDIR=/usr/share/hwdata \
+  PCI_IDS=pci.ids \
+  PCI_COMPRESSED_IDS=0 \
+  SHARED=yes \
+  STRIP="" \
+  OPT="$SLKCFLAGS" \
+  $NUMJOBS || exit 1
+
+# Install both static and shared libraries:
 make install install-lib \
   PREFIX=/usr \
   SBINDIR=/sbin \
@@ -100,9 +119,12 @@ make install install-lib \
   IDSDIR=/usr/share/hwdata \
   PCI_IDS=pci.ids \
   PCI_COMPRESSED_IDS=0 \
-  SHARED=no \
+  SHARED=yes \
   DESTDIR=$PKG
 
+mv lib/libpci.a.toinstall lib/libpci.a
+install -p -m 644 lib/libpci.a.toinstall $PKG/usr/lib/libpci.a
+
 mkdir -p $PKG/usr/sbin
 mv $PKG/sbin/update-pciids $PKG/usr/sbin/update-pciids
 
@@ -127,8 +149,12 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+case "$ARCH" in
+  arm*) ;;
+  *)    find $PKG | xargs file | grep -e "executable" -e "shared object" \
+          | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+        ;;
+esac
 
 mkdir -p $PKG/usr/doc/pciutils-$VERSION
 cp -a \
diff --git a/source.local/a/pkgtools/pkgtools.SlackBuild b/source.local/a/pkgtools/pkgtools.SlackBuild
index d2d6898..b8f37cd 100755
--- a/source.local/a/pkgtools/pkgtools.SlackBuild
+++ b/source.local/a/pkgtools/pkgtools.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005, 2006, 2007, 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
@@ -27,9 +27,9 @@ fi
 PKG=$TMP/package-pkgtools
 
 # *** UPDATE THESE WITH EACH BUILD:
-VERSION=13.37
+VERSION=14.0
 ARCH=noarch
-BUILD=9
+BUILD=1
 
 if [ ! -d $TMP ]; then
   mkdir -p $TMP # location to build the source
diff --git a/source.local/a/pkgtools/scripts/pkgtool b/source.local/a/pkgtools/scripts/pkgtool
index a64ef09..ba8ecd0 100644
--- a/source.local/a/pkgtools/scripts/pkgtool
+++ b/source.local/a/pkgtools/scripts/pkgtool
@@ -212,7 +212,7 @@ else  # there were no arguments, so we'll get the needed information from the
  CMD_START="true"
  rm -f $TMP/SeT*
  while [ 0 ]; do
-  dialog --title "Slackware Package Tool (pkgtool version 13.37)" \
+  dialog --title "Slackware Package Tool (pkgtool version 14.0)" \
 --menu "\nWelcome to the Slackware package tool.\n\
 \nWhich option would you like?\n" 17 75 7 \
 "Current" "Install packages from the current directory" \
diff --git a/source.local/a/pkgtools/scripts/setup.services b/source.local/a/pkgtools/scripts/setup.services
index aee2599..f700a8d 100644
--- a/source.local/a/pkgtools/scripts/setup.services
+++ b/source.local/a/pkgtools/scripts/setup.services
@@ -148,7 +148,7 @@ if [ -r etc/rc.d/rc.messagebus ]; then
     RC_MESSAGEBUS=off
   fi
   cat << EOF >> $TMP/tmpscript
-    "rc.messagebus" "D-Bus system message bus" $RC_MESSAGEBUS "Used for communication by HAL and other programs." \\
+    "rc.messagebus" "D-Bus system message bus" $RC_MESSAGEBUS "Used for interprocess communication and coordination." \\
 EOF
 fi
 
diff --git a/source.local/a/sdparm/sdparm.SlackBuild b/source.local/a/sdparm/sdparm.SlackBuild
index 782344b..7254cc4 100755
--- a/source.local/a/sdparm/sdparm.SlackBuild
+++ b/source.local/a/sdparm/sdparm.SlackBuild
@@ -24,33 +24,35 @@
 
 
 PKGNAM=sdparm
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.07}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-"-j6"}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "i486" ]; then
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  elif [ "$ARCH" = "s390" ]; then
+    SLKCFLAGS="-O2"
+  elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2 -fPIC"
+  else
+    SLKCFLAGS="-O2"
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/a/slocate/slocate.CVE-2007-0277.diff.gz b/source.local/a/slocate/slocate.CVE-2007-0277.diff.gz
new file mode 100644
index 0000000..5d91a74
--- /dev/null
+++ b/source.local/a/slocate/slocate.CVE-2007-0277.diff.gz
diff --git a/source.local/a/slocate/slocate.SlackBuild b/source.local/a/slocate/slocate.SlackBuild
index 4b3c5cd..78704e4 100755
--- a/source.local/a/slocate/slocate.SlackBuild
+++ b/source.local/a/slocate/slocate.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,30 +25,32 @@
 
 PKGNAM=slocate
 VERSION=3.1
-BUILD=${BUILD:-3}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+BUILD=${BUILD:-4}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "i486" ]; then
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  elif [ "$ARCH" = "s390" ]; then
+    SLKCFLAGS="-O2"
+  elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2 -fPIC"
+  else
+    SLKCFLAGS="-O2"
+  fi
 fi
 
 CWD=$(pwd)
@@ -64,8 +66,12 @@ explodepkg $CWD/_slocate.tar.gz
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xzvf $CWD/$PKGNAM-$VERSION.tar.gz
-cd $PKGNAM-$VERSION
+tar xzvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/slocate.bigfile.diff.gz | patch -p0 --verbose || exit 1
+zcat $CWD/slocate.CVE-2007-0277.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 2750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -74,7 +80,7 @@ find . \
   -exec chmod 644 {} \;
 
 cd src
-make CFLAGS="$SLKCFLAGS"
+make CFLAGS="$SLKCFLAGS -D_LARGEFILE64_SOURCE" || exit 1
 cd ..
 strip --strip-unneeded src/slocate
 mkdir -p $PKG/usr/bin
diff --git a/source.local/a/slocate/slocate.bigfile.diff.gz b/source.local/a/slocate/slocate.bigfile.diff.gz
new file mode 100644
index 0000000..f78a1ff
--- /dev/null
+++ b/source.local/a/slocate/slocate.bigfile.diff.gz
diff --git a/source.local/a/smartmontools/smartmontools.SlackBuild b/source.local/a/smartmontools/smartmontools.SlackBuild
index 0daf246..5588d26 100755
--- a/source.local/a/smartmontools/smartmontools.SlackBuild
+++ b/source.local/a/smartmontools/smartmontools.SlackBuild
@@ -24,25 +24,29 @@
 
 
 PKGNAM=smartmontools
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-5.43}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "x86_64" ]; then
+    LIBDIRSUFFIX="64"
+  else
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/a/tcsh/tcsh.SlackBuild b/source.local/a/tcsh/tcsh.SlackBuild
index f39be09..0518ef8 100755
--- a/source.local/a/tcsh/tcsh.SlackBuild
+++ b/source.local/a/tcsh/tcsh.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,35 +24,33 @@
 
 
 PKGNAM=tcsh
-VERSION=6.17.00
+VERSION=${VERSION:-6.18.01}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "i486" ]; then
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2"
+  else
+    SLKCFLAGS="-O2"
+  fi
 fi
 
 case "$ARCH" in
@@ -60,6 +58,10 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -83,7 +85,7 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=  \
   --build=$TARGET
-make -j4 || exit 1
+make ${NUMJOBS} || exit 1
 
 mkdir -p $PKG/etc
 mkdir -p $PKG/bin
diff --git a/source.local/a/udisks/slack-desc b/source.local/a/udisks/slack-desc
new file mode 100644
index 0000000..a85adeb
--- /dev/null
+++ b/source.local/a/udisks/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 ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+udisks: udisks (storage device daemon)
+udisks:
+udisks: The udisks project provides a storage daemon that implements D-Bus
+udisks: interfaces that can be used to query and manipulate storage devices.
+udisks:
+udisks: It also includes a command-line tool, udisks(1), that can be used to
+udisks: query and control the daemon.
+udisks:
+udisks: Homepage:  http://www.freedesktop.org/wiki/Software/udisks
+udisks:
+udisks:
diff --git a/source.local/a/udisks/udisks.SlackBuild b/source.local/a/udisks/udisks.SlackBuild
new file mode 100755
index 0000000..78c1f2f
--- /dev/null
+++ b/source.local/a/udisks/udisks.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+# Slackware build script for udisks
+
+# Copyright 2010, 2011  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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=udisks
+VERSION=${VERSION:-1.0.4}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz
+cd $PKGNAM-$VERSION || 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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --build=$TARGET
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Move the bash completion file to the right place
+mkdir -p $PKG/etc/bash_completion.d
+mv $PKG/etc/profile.d/udisks-bash-completion.sh \
+   $PKG/etc/bash_completion.d/udisks
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/a/udisks/udisks.url b/source.local/a/udisks/udisks.url
new file mode 100644
index 0000000..cef0134
--- /dev/null
+++ b/source.local/a/udisks/udisks.url
@@ -0,0 +1 @@
+http://hal.freedesktop.org/releases/
diff --git a/source.local/a/udisks2/doinst.sh.gz b/source.local/a/udisks2/doinst.sh.gz
new file mode 100644
index 0000000..8a3cbf2
--- /dev/null
+++ b/source.local/a/udisks2/doinst.sh.gz
diff --git a/source.local/a/udisks2/slack-desc b/source.local/a/udisks2/slack-desc
new file mode 100644
index 0000000..0d6d442
--- /dev/null
+++ b/source.local/a/udisks2/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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+udisks2: udisks2 (storage device daemon v2)
+udisks2:
+udisks2: The udisks project provides a storage daemon that implements D-Bus
+udisks2: interfaces that can be used to query and manipulate storage devices.
+udisks2:
+udisks2: It also includes a command-line tool, udisks(1), that can be used to
+udisks2: query and control the daemon.
+udisks2:
+udisks2: Homepage:  http://www.freedesktop.org/wiki/Software/udisks
+udisks2:
+udisks2:
diff --git a/source.local/a/udisks2/udisks2.SlackBuild b/source.local/a/udisks2/udisks2.SlackBuild
new file mode 100755
index 0000000..ac416ef
--- /dev/null
+++ b/source.local/a/udisks2/udisks2.SlackBuild
@@ -0,0 +1,141 @@
+#!/bin/sh
+
+# Slackware build script for udisks
+
+# Copyright 2010, 2011  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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+PKGNAM=udisks2
+SRCNAM=udisks
+VERSION=${VERSION:-2.1.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz || exit 1
+cd $SRCNAM-$VERSION || 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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --disable-static \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING INSTALL NEWS README* \
+  $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/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/a/upower/doinst.sh.gz b/source.local/a/upower/doinst.sh.gz
new file mode 100644
index 0000000..78ef222
--- /dev/null
+++ b/source.local/a/upower/doinst.sh.gz
diff --git a/source.local/a/upower/slack-desc b/source.local/a/upower/slack-desc
new file mode 100644
index 0000000..b4401b9
--- /dev/null
+++ b/source.local/a/upower/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 ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+upower: UPower (power management abstraction daemon)
+upower:
+upower: UPower is an abstraction for enumerating power devices, listening to 
+upower: device events and querying history and statistics. Any application or 
+upower: service on the system can access the org.freedesktop.UPower service 
+upower: via the system message bus. Some operations (such as suspending the 
+upower: system) are restricted using PolicyKit. 
+upower:
+upower: Homepage: http://upower.freedesktop.org/
+upower:
+upower:
diff --git a/source.local/a/upower/upower.SlackBuild b/source.local/a/upower/upower.SlackBuild
new file mode 100755
index 0000000..0a95816
--- /dev/null
+++ b/source.local/a/upower/upower.SlackBuild
@@ -0,0 +1,123 @@
+#!/bin/sh
+
+# Slackware build script for upower
+
+# Copyright 2010, 2011  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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=upower
+VERSION=${VERSION:-0.9.17}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz
+cd $PKGNAM-$VERSION || 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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --enable-man-pages \
+  --build=$TARGET
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Don't clobber the config file on upgrades
+mv $PKG/etc/UPower/UPower.conf $PKG/etc/UPower/UPower.conf.new
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+
+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
+
diff --git a/source.local/a/upower/upower.url b/source.local/a/upower/upower.url
new file mode 100644
index 0000000..30c25b7
--- /dev/null
+++ b/source.local/a/upower/upower.url
@@ -0,0 +1 @@
+http://upower.freedesktop.org/releases/
diff --git a/source.local/a/usb_modeswitch/device_reference.txt.gz b/source.local/a/usb_modeswitch/device_reference.txt.gz
index 3683139..2c1d266 100644
--- a/source.local/a/usb_modeswitch/device_reference.txt.gz
+++ b/source.local/a/usb_modeswitch/device_reference.txt.gz
diff --git a/source.local/a/usb_modeswitch/usb_modeswitch.SlackBuild b/source.local/a/usb_modeswitch/usb_modeswitch.SlackBuild
index 9a624d4..de45454 100755
--- a/source.local/a/usb_modeswitch/usb_modeswitch.SlackBuild
+++ b/source.local/a/usb_modeswitch/usb_modeswitch.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for usb_modeswitch.
 
-# Copyright 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # Copyright 2010  David Somero, Athens, TN, USA
 # All rights reserved.
 #
@@ -23,50 +23,48 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
 PKGNAM=usb_modeswitch
-VERSION=${VERSION:-1.1.6}
-DATAVER=${DATAVER:-20101222}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.2.4}
+DATAVER=${DATAVER:-20120812}
+BUILD=${BUILD:-2}
 
 # Upstream is playing guess the program name.
 SRCPKGNAM=$(echo $PKGNAM | tr _ -)
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -81,11 +79,30 @@ find . \
  -exec chmod 644 {} \;
 
 make clean
-gcc $SLKCFLAGS $LDFLAGS -lusb -Wall -o usb_modeswitch usb_modeswitch.c || exit 1
-
-install -D -s -m 0755 usb_modeswitch $PKG/usr/sbin/usb_modeswitch
-install -D -m 0755 usb_modeswitch.tcl $PKG/lib/udev/usb_modeswitch
-install -D -m 0644 usb_modeswitch.conf $PKG/etc/usb_modeswitch.conf.new
+# "make static" uses the embedded "jim" Tcl interpreter
+make static
+
+install -D -s --mode=755 usb_modeswitch $PKG/usr/sbin/usb_modeswitch
+install -D --mode=755 usb_modeswitch.sh $PKG/lib/udev/usb_modeswitch
+install -D --mode=644 usb_modeswitch.conf $PKG/etc/usb_modeswitch.conf.new
+install -D --mode=644 usb_modeswitch.1 $PKG/usr/man/man1/usb_modeswitch.1
+install -d $PKG/var/lib/usb_modeswitch
+install -D -s --mode=755 usb_modeswitch_dispatcher $PKG/usr/sbin/usb_modeswitch_dispatcher
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
@@ -93,6 +110,10 @@ cp -a \
   $PKG/usr/doc/$PKGNAM-$VERSION
 # http://www.draisberghof.de/usb_modeswitch/device_reference.txt.gz
 cat $CWD/device_reference.txt.gz > $PKG/usr/doc/$PKGNAM-$VERSION/device_reference.txt
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/jim
+cp -a \
+  jim/{AUTHORS,LICENSE,README*} \
+  $PKG/usr/doc/$PKGNAM-$VERSION/jim
 
 # 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:
@@ -113,9 +134,7 @@ find . \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
-install -D -m 0644 40-usb_modeswitch.rules $PKG/lib/udev/rules.d/40-usb_modeswitch.rules
-mkdir -p $PKG/etc
-cp -a usb_modeswitch.d $PKG/etc
+make install DESTDIR=$PKG || exit 1
 mkdir -p $PKG/usr/doc/usb-modeswitch-data-${DATAVER}
 cat ChangeLog | head -n 1000 > $PKG/usr/doc/usb-modeswitch-data-${DATAVER}/ChangeLog
 touch -r ChangeLog $PKG/usr/doc/usb-modeswitch-data-${DATAVER}/ChangeLog
diff --git a/source.local/ap/alsa-utils/alsa-utils.SlackBuild b/source.local/ap/alsa-utils/alsa-utils.SlackBuild
index 45d7230..18d95fb 100755
--- a/source.local/ap/alsa-utils/alsa-utils.SlackBuild
+++ b/source.local/ap/alsa-utils/alsa-utils.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
@@ -24,41 +24,39 @@
 
 
 PKGNAM=alsa-utils
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.0.26}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -76,7 +74,7 @@ cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
-zcat $CWD/alsa-utils.alsaconf.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit
+#zcat $CWD/alsa-utils.alsaconf.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit
 
 chown -R root:root .
 find . \
@@ -91,6 +89,7 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --sysconfdir=/etc \
+  --disable-alsaconf \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
diff --git a/source.local/ap/cdrtools/cdrtools.SlackBuild b/source.local/ap/cdrtools/cdrtools.SlackBuild
index be11866..098e82c 100755
--- a/source.local/ap/cdrtools/cdrtools.SlackBuild
+++ b/source.local/ap/cdrtools/cdrtools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PKGNAM=cdrtools
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+VERSION=${VERSION:-3.01a13}
 BUILD=${BUILD:-1}
 
 ZISOFSTOOLS=1.0.8
diff --git a/source.local/ap/ddrescue/ddrescue.SlackBuild b/source.local/ap/ddrescue/ddrescue.SlackBuild
index 1c742a3..acef834 100755
--- a/source.local/ap/ddrescue/ddrescue.SlackBuild
+++ b/source.local/ap/ddrescue/ddrescue.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=ddrescue
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
+VERSION=${VERSION:-1.16}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/ap/foomatic-filters/foomatic-filters.SlackBuild b/source.local/ap/foomatic-filters/foomatic-filters.SlackBuild
index 7ec03d4..3ae8fa1 100755
--- a/source.local/ap/foomatic-filters/foomatic-filters.SlackBuild
+++ b/source.local/ap/foomatic-filters/foomatic-filters.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=foomatic-filters
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-4.0.12}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/ap/gphoto2/gphoto2.SlackBuild b/source.local/ap/gphoto2/gphoto2.SlackBuild
index 355b05b..4f0c5b0 100755
--- a/source.local/ap/gphoto2/gphoto2.SlackBuild
+++ b/source.local/ap/gphoto2/gphoto2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,37 +20,43 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=gphoto2
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.4.14}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -82,7 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --docdir=/usr/doc/gphoto2-${VERSION} \
+  --docdir=/usr/doc/${PKGNAM}-${VERSION} \
   --without-cdk \
   --enable-static=no \
   --build=$TARGET
diff --git a/source.local/ap/gutenprint/gutenprint.SlackBuild b/source.local/ap/gutenprint/gutenprint.SlackBuild
index c608f33..32c7407 100755
--- a/source.local/ap/gutenprint/gutenprint.SlackBuild
+++ b/source.local/ap/gutenprint/gutenprint.SlackBuild
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=gutenprint
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-5.2.9}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/ap/hplip/hplip.SlackBuild b/source.local/ap/hplip/hplip.SlackBuild
index e282c35..5c02123 100755
--- a/source.local/ap/hplip/hplip.SlackBuild
+++ b/source.local/ap/hplip/hplip.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for hplip
 
 # Copyright 2006-2010  Robby Workman, Northport, Alabama, USA
-# Copyright 2006-2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,42 +23,43 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=hplip
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.13.3}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -78,6 +79,8 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
+zcat $CWD/hplip.no.upgrade.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -114,6 +117,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-network-build=yes \
   --enable-qt4 \
   --enable-policykit \
+  --enable-cups-ppd-install \
   --build=$TARGET \
   --host=$TARGET \
   || exit 1
diff --git a/source.local/ap/hplip/hplip.no.upgrade.diff.gz b/source.local/ap/hplip/hplip.no.upgrade.diff.gz
new file mode 100644
index 0000000..68a3efc
--- /dev/null
+++ b/source.local/ap/hplip/hplip.no.upgrade.diff.gz
diff --git a/source.local/ap/htop/htop.SlackBuild b/source.local/ap/htop/htop.SlackBuild
index 8bd8d42..76f82c2 100755
--- a/source.local/ap/htop/htop.SlackBuild
+++ b/source.local/ap/htop/htop.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=htop
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.0.2}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -82,6 +83,7 @@ find . \
   -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
+LDFLAGS="-ltinfo" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
diff --git a/source.local/ap/linuxdoc-tools/ChangeLog.txt b/source.local/ap/linuxdoc-tools/ChangeLog.txt
index 53324c8..0c971b3 100644
--- a/source.local/ap/linuxdoc-tools/ChangeLog.txt
+++ b/source.local/ap/linuxdoc-tools/ChangeLog.txt
@@ -1,3 +1,23 @@
+Fri Jun 29 17:34:25 BST 2012
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools 0.9.67, build 2.
+  * Made a compatibility symlink between 
+   /usr/share/xml/docbook/stylesheet/docbook-xsl -> /usr/share/xml/docbook/xsl-stylesheets-<ver>
+  Thanks to Patrick Verner for the suggestion.
+
+Mon May 28 21:40:41 BST 2012
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools 0.9.67, build 1
+  * Removed the files that were overlapping with the 'Python' (and any other) package.
+  * Upgraded to linuxdoc-tools 0.9.67
+  * Upgraded to gnome-doc-utils 0.20.10
+  * Upgraded to xmlto-0.0.25
+  * Upgraded to gtk-doc-1.18
+  * Upgraded to AsciiDoc-8.6.7
+  * Upgraded to DocBook XSL Stylesheets 1.76.1
+  * Fix OpenJade FTBFS with Perl 5.16 installed: Copy the perl4 corelib 'getopts.pl'
+    into OpenJade's build directory as a build-time work-around.
+
 Sun May 15 03:42:16 UTC 2011
  Patrick Volkerding <volkerdi@slackware.com>
  linuxdoc-tools 0.9.66, build 9
diff --git a/source.local/ap/linuxdoc-tools/arm/build b/source.local/ap/linuxdoc-tools/arm/build
index eb4f18c..f5a418d 100755
--- a/source.local/ap/linuxdoc-tools/arm/build
+++ b/source.local/ap/linuxdoc-tools/arm/build
@@ -9,9 +9,9 @@ source /usr/share/slackdev/buildkit.sh
 
 # Package metadata:
 export PKGNAM=linuxdoc-tools
-export VERSION=${VERSION:-0.9.66}
+export VERSION=${VERSION:-0.9.67}
 export PKGARCH=${PKGARCH:-arm}
-export BUILD=${BUILD:-4}
+export BUILD=${BUILD:-2}
 export PKGSERIES=${PKGSERIES:-ap}
 export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.tgz
 export PKGEXT=${PKGEXT:-tgz}
diff --git a/source.local/ap/linuxdoc-tools/linuxdoc-tools.build b/source.local/ap/linuxdoc-tools/linuxdoc-tools.build
index 1e86ec0..baf0ea1 100755
--- a/source.local/ap/linuxdoc-tools/linuxdoc-tools.build
+++ b/source.local/ap/linuxdoc-tools/linuxdoc-tools.build
@@ -20,20 +20,28 @@ LINUXDOCTOOLSVER=$PKGVERSION
 SGMLDTD3VER=3.1
 SGMLDTD4VER=4.5
 XMLDTDVER=4.5
-XSLSTYLESHEETSVER=1.75.2
+XSLSTYLESHEETSVER=1.76.1
 DSSSLSTYLESHEETSVER=1.79
 SGMLCOMMONVER=0.6.3
 OPENJADEVER=1.3.3-pre1
 OPENSPVER=1.5.2
-GNOMEDOCUTILSVER=0.20.4
-GTKDOCVER=1.15
+GNOMEDOCUTILSVER=0.20.10
+GTKDOCVER=1.18
 SGMLSPLVER=1.03ii
-XMLTOVER=0.0.23
-ASCIIDOCVER=8.6.2
+XMLTOVER=0.0.25
+ASCIIDOCVER=8.6.7
 DOCBOOKUTILSVER=0.6.14
 
 # Determine the general CFLAGS for the known architectures:
 case $ARCH in
+  armv7hl) export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+           export LIBDIRSUFFIX=""
+           export HOSTTARGET="-gnueabi"
+           ;;
+  arm)     export SLKCFLAGS="-O2 -march=armv5te"
+           export LIBDIRSUFFIX=""
+           export HOSTTARGET="-gnueabi"
+           ;;
   i486)    export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
            export LIBDIRSUFFIX=""
            export HOSTTARGET=""
@@ -46,14 +54,6 @@ case $ARCH in
            export LIBDIRSUFFIX="64"
            export HOSTTARGET=""
            ;;
-  armv7hl) export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-           export LIBDIRSUFFIX=""
-           export HOSTTARGET="-gnueabi"
-           ;;
-  arm)     export SLKCFLAGS="-O2 -march=armv4t"
-           export LIBDIRSUFFIX=""
-           export HOSTTARGET="-gnueabi"
-           ;;
 esac
 
 # The build order is purposive.
@@ -75,7 +75,7 @@ find . \
   -exec chmod 644 {} \;
 
 # Revert a change that breaks processing the git documentation:
-xz -dc $CWD/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz | patch --verbose -p1 || exit 1
+# xz -dc $CWD/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz | patch --verbose -p1 || exit 1
 
 # Configure:
 ./configure \
@@ -360,6 +360,15 @@ find . \
 # Apply patches:
 sed -i "s/iostream.h/iostream/g" style/MultiLineInlineNote.cxx
 
+# GCC 4.6 patch:
+xz -dc $CWD/sources/openjade-1.3.2-gcc46.patch.xz | patch --verbose -p1 || exit 1
+
+# Install the old Perl 4 'getopts' function.  This has been deprecated in Perl 5.16
+# and since it seems that OpenJade isn't being actively released by upstream, we'll
+# work around by supplying it to OpenJade directly.  It's only a build-time fix anyway
+# so it's ok to have a dirty work-around:
+xz -dc $CWD/sources/openjade-1.3-getopts.pl.xz > getopts.pl
+
 # Configure without optimisation.
 # OpenSP & OpenJade are sensitive to optimisations and can result
 # in segfaults with anything other than O2 - particularly on the ARM
@@ -378,8 +387,8 @@ sed -i "s/iostream.h/iostream/g" style/MultiLineInlineNote.cxx
   --datadir=/usr/share/sgml/openjade-$OPENJADEVER \
   || exit 1
 
-# Build:
-make || exit 1
+# Build (setting the perl library to be the PWD so it finds the old 'getopts.pl'):
+make PERL5LIB=$PWD || exit 1
 
 # Install:
 mkdir -p /etc/sgml
@@ -693,6 +702,7 @@ find . \
 
 # Apply patches:
 for i in \
+  docbook-xsl-mandir.patch \
   docbook-xsl-list-item-body.patch \
   docbook-xsl-marginleft.patch \
   docbook-xsl-newmethods.patch \
@@ -708,6 +718,12 @@ cp -fav \
  htmlhelp images javahelp lib manpages params profiling \
  slides template tools website wordml xhtml             \
  /usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER
+# Some Linux distributions have this here, so we install a compatibility symlink:
+# (this convoluted way of doing it is for makepkg's benefit)
+mkdir -vpm755 /usr/share/xml/docbook/stylesheet
+( cd /usr/share/xml/docbook/stylesheet
+  rm -fv docbook-xsl
+  ln -vfs ../xsl-stylesheets-$XSLSTYLESHEETSVER docbook-xsl )
 
 # Create config files:
 if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi
@@ -746,9 +762,9 @@ cp -fav doc/* README* RELEASE-NOTES* NEWS* \
 # Extract source:
 cd $TMP
 mkdir xmlto && cd xmlto
-#tar xvf $CWD/sources/xmlto-$XMLTOVER.tar.*z*
-rpm2cpio $CWD/sources/xmlto-${XMLTOVER}*.src.rpm | cpio -div || exit 1
-tar xvvf xmlto-$XMLTOVER.tar.*z*
+tar xvf $CWD/sources/xmlto-$XMLTOVER.tar.*z*
+#rpm2cpio $CWD/sources/xmlto-${XMLTOVER}*.src.rpm | cpio -div || exit 1
+#tar xvvf xmlto-$XMLTOVER.tar.*z*
 cd xmlto-$XMLTOVER || exit 1
 chown -R root:root .
 find . \
@@ -757,9 +773,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Apply patches:
-patch --verbose -p1 < ../xmlto-0.0.23-Lchapterpassivetex.patch || exit 1
-
 # Configure:
 ./configure \
   --prefix=/usr \
@@ -946,13 +959,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Apply patch to fix problem with vim:
-xz -dc $CWD/sources/gtk-doc.patch.xz | patch --verbose -p1 || exit 1
-
 # Configure:
 ./configure \
   --prefix=/usr \
-  --enable-public-id \
   --disable-scrollkeeper \
   || exit 1
 
diff --git a/source.local/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz b/source.local/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz
deleted file mode 100644
index 85b5405..0000000
--- a/source.local/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz
+++ /dev/null
diff --git a/source.local/ap/linuxdoc-tools/sources/docbook-style-xsl-1.75.2-6.fc14.src.rpm b/source.local/ap/linuxdoc-tools/sources/docbook-style-xsl-1.75.2-6.fc14.src.rpm
deleted file mode 100644
index 18d48f2..0000000
--- a/source.local/ap/linuxdoc-tools/sources/docbook-style-xsl-1.75.2-6.fc14.src.rpm
+++ /dev/null
diff --git a/source.local/ap/linuxdoc-tools/sources/docbook-style-xsl-1.76.1-5.fc17.src.rpm b/source.local/ap/linuxdoc-tools/sources/docbook-style-xsl-1.76.1-5.fc17.src.rpm
new file mode 100644
index 0000000..2de71ba
--- /dev/null
+++ b/source.local/ap/linuxdoc-tools/sources/docbook-style-xsl-1.76.1-5.fc17.src.rpm
diff --git a/source.local/ap/linuxdoc-tools/sources/docbook-utils-0.6.14-24.fc14.src.rpm b/source.local/ap/linuxdoc-tools/sources/docbook-utils-0.6.14-24.fc14.src.rpm
deleted file mode 100644
index 82f5f30..0000000
--- a/source.local/ap/linuxdoc-tools/sources/docbook-utils-0.6.14-24.fc14.src.rpm
+++ /dev/null
diff --git a/source.local/ap/linuxdoc-tools/sources/docbook-utils-0.6.14-30.fc17.src.rpm b/source.local/ap/linuxdoc-tools/sources/docbook-utils-0.6.14-30.fc17.src.rpm
new file mode 100644
index 0000000..d3e61ec
--- /dev/null
+++ b/source.local/ap/linuxdoc-tools/sources/docbook-utils-0.6.14-30.fc17.src.rpm
diff --git a/source.local/ap/linuxdoc-tools/sources/gtk-doc.patch.xz b/source.local/ap/linuxdoc-tools/sources/gtk-doc.patch.xz
deleted file mode 100644
index fa50e3e..0000000
--- a/source.local/ap/linuxdoc-tools/sources/gtk-doc.patch.xz
+++ /dev/null
diff --git a/source.local/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.66-6.fc14.src.rpm b/source.local/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.66-6.fc14.src.rpm
deleted file mode 100644
index d258138..0000000
--- a/source.local/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.66-6.fc14.src.rpm
+++ /dev/null
diff --git a/source.local/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.67-1.fc18.src.rpm b/source.local/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.67-1.fc18.src.rpm
new file mode 100644
index 0000000..4f62fa4
--- /dev/null
+++ b/source.local/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.67-1.fc18.src.rpm
diff --git a/source.local/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl.xz b/source.local/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl.xz
new file mode 100644
index 0000000..897a488
--- /dev/null
+++ b/source.local/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl.xz
diff --git a/source.local/ap/linuxdoc-tools/sources/openjade-1.3.2-gcc46.patch.xz b/source.local/ap/linuxdoc-tools/sources/openjade-1.3.2-gcc46.patch.xz
new file mode 100644
index 0000000..20e892d
--- /dev/null
+++ b/source.local/ap/linuxdoc-tools/sources/openjade-1.3.2-gcc46.patch.xz
diff --git a/source.local/ap/linuxdoc-tools/sources/opensp-1.5.2-12.fc12.src.rpm b/source.local/ap/linuxdoc-tools/sources/opensp-1.5.2-12.fc12.src.rpm
deleted file mode 100644
index e2e0f38..0000000
--- a/source.local/ap/linuxdoc-tools/sources/opensp-1.5.2-12.fc12.src.rpm
+++ /dev/null
diff --git a/source.local/ap/linuxdoc-tools/sources/opensp-1.5.2-14.fc17.src.rpm b/source.local/ap/linuxdoc-tools/sources/opensp-1.5.2-14.fc17.src.rpm
new file mode 100644
index 0000000..ab9d160
--- /dev/null
+++ b/source.local/ap/linuxdoc-tools/sources/opensp-1.5.2-14.fc17.src.rpm
diff --git a/source.local/ap/linuxdoc-tools/sources/sgml-common-0.6.3-33.fc14.src.rpm b/source.local/ap/linuxdoc-tools/sources/sgml-common-0.6.3-33.fc14.src.rpm
deleted file mode 100644
index 842196f..0000000
--- a/source.local/ap/linuxdoc-tools/sources/sgml-common-0.6.3-33.fc14.src.rpm
+++ /dev/null
diff --git a/source.local/ap/linuxdoc-tools/sources/sgml-common-0.6.3-36.fc17.src.rpm b/source.local/ap/linuxdoc-tools/sources/sgml-common-0.6.3-36.fc17.src.rpm
new file mode 100644
index 0000000..a917068
--- /dev/null
+++ b/source.local/ap/linuxdoc-tools/sources/sgml-common-0.6.3-36.fc17.src.rpm
diff --git a/source.local/ap/linuxdoc-tools/sources/source.download b/source.local/ap/linuxdoc-tools/sources/source.download
index 40e05d2..c9608b2 100755
--- a/source.local/ap/linuxdoc-tools/sources/source.download
+++ b/source.local/ap/linuxdoc-tools/sources/source.download
@@ -7,24 +7,27 @@
 
 # linuxdoc-tools:
 # This provides things such as sgml2txt.
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/linuxdoc-tools-0.9.66-6.fc14.src.rpm
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/l/linuxdoc-tools-0.9.67-1.fc18.src.rpm
 
 # OpenSP:
 # http://openjade.sourceforge.net/download.html
 # wget -c http://kent.dl.sourceforge.net/sourceforge/openjade/OpenSP-1.5.2.tar.gz
 # 
-wget -c http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/opensp-1.5.2-12.fc12.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/opensp-1.5.2-14.fc17.src.rpm
 
 # OpenJade:
 # http://openjade.sourceforge.net/
+# We're using a gcc 4.6 patch from Fedora's SRPM: 
+#  ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/openjade-1.3.2-39.fc17.src.rpm
+# And we're using the old Perl 4 core libraries (as a dirty but effective build time work-around) taken from:
+# http://packages.debian.org/sid/libperl4-corelibs-perl
+# http://ftp.de.debian.org/debian/pool/main/libp/libperl4-corelibs-perl/libperl4-corelibs-perl_0.003.orig.tar.gz
 wget -c http://downloads.sourceforge.net/openjade/openjade-1.3.3-pre1.tar.gz
 
-
 # sgmltools-common.
 # It's broken and needs patching so we'll use Fedora's.
 #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/sgml-common-0.6.3-33.fc14.src.rpm
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/s/sgml-common-0.6.3-36.fc17.src.rpm
 
 
 # DocBook docs:
@@ -34,8 +37,7 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/
 #wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip
 # We use Debian's source because it's more convenient since they package all versions in one archive:
 wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz
-
-
+#
 # http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html
 # Check versions:
 # http://sourceforge.net/projects/docbook/files/
@@ -43,13 +45,13 @@ wget -c ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/docbook-dsssl-1.79.tar
 wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2
 # Why don't they put the patches into the distributed source...???
 #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-utils-0.6.14-24.fc14.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-utils-0.6.14-30.fc17.src.rpm
+#
 #
 wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
 # https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-style-xsl-1.75.2-6.fc14.src.rpm
-
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-style-xsl-1.76.1-5.fc17.src.rpm
+#
 # We use the Fedora "docbook-style-xsl" SRPM for this rather than the original source which is why
 # these "docbook-xsl*" files aren't in our sources directory.
 #wget -c "http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2.tar.bz2?use_mirror=freefr"
@@ -61,13 +63,13 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/
 # I guess this mirror is out of date now.  It's easier to just look at Fedora's development
 # directory anyway :-)
 # wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.0.tar.bz2
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/gnome-doc-utils-0.20.1-1.fc14.src.rpm
+wget ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gnome-doc-utils-0.20.10-2.fc18.src.rpm
 
 # gtk-doc:
 # When upgrading this, it's worth checking the Fedora SRPM.  For version 1.13
 # we're carrying a fix for gtk-doc-fixref.  Make sure newer versions don't need
 # any patches!
-wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2
+wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.18/gtk-doc-1.18.tar.bz2
 # http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0
 
 # sgmlspl
@@ -76,14 +78,12 @@ wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2
 wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz
 wget -c http://ftp.de.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-32.diff.gz
 
-
 # xmlto
 # https://fedorahosted.org/releases/x/m/xmlto
 # wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2
-# Fedora 14 includes a patch, so we'll take it:
-wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/xmlto-0.0.23-3.fc13.src.rpm
-
+# Fedora includes a patch, so we'll take it:
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/x/xmlto-0.0.25-2.fc17.src.rpm
 
 # AsciiDoc
 # http://www.methods.co.nz/asciidoc/
-wget -c "http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.2/asciidoc-8.6.2.tar.gz/download"
+wget -c "http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.7/asciidoc-8.6.7.tar.gz/download"
diff --git a/source.local/ap/linuxdoc-tools/sources/xmlto-0.0.23-3.fc13.src.rpm b/source.local/ap/linuxdoc-tools/sources/xmlto-0.0.23-3.fc13.src.rpm
deleted file mode 100644
index ce771c2..0000000
--- a/source.local/ap/linuxdoc-tools/sources/xmlto-0.0.23-3.fc13.src.rpm
+++ /dev/null
diff --git a/source.local/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source.local/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
index f4c41c1..8c4855c 100755
--- a/source.local/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
+++ b/source.local/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
@@ -33,8 +33,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-export PKGVERSION=0.9.66 # use the version of linuxdoc-tools as the package version.
-BUILD=${BUILD:-9}
+export PKGVERSION=0.9.67 # use the version of linuxdoc-tools as the package version.
+BUILD=${BUILD:-2}
 PKGEXT=${PKGEXT:-txz}
 
 export CWD=$PWD
diff --git a/source.local/ap/lm_sensors/lm_sensors-3.1.2.tar.bz2.sig b/source.local/ap/lm_sensors/lm_sensors-3.1.2.tar.bz2.sig
deleted file mode 100644
index b2c0a24..0000000
--- a/source.local/ap/lm_sensors/lm_sensors-3.1.2.tar.bz2.sig
+++ /dev/null
diff --git a/source.local/ap/lm_sensors/lm_sensors-3.3.3.tar.bz2.sig b/source.local/ap/lm_sensors/lm_sensors-3.3.3.tar.bz2.sig
new file mode 100644
index 0000000..12d89d6
--- /dev/null
+++ b/source.local/ap/lm_sensors/lm_sensors-3.3.3.tar.bz2.sig
diff --git a/source.local/ap/lm_sensors/lm_sensors.SlackBuild b/source.local/ap/lm_sensors/lm_sensors.SlackBuild
index a3b0093..70fd30e 100755
--- a/source.local/ap/lm_sensors/lm_sensors.SlackBuild
+++ b/source.local/ap/lm_sensors/lm_sensors.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,22 +20,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=lm_sensors
-VERSION=${VERSION:-3.1.2}
+VERSION=${VERSION:-3.3.3}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  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=$MARCH ;;
+       *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
diff --git a/source.local/ap/lsscsi/lsscsi.SlackBuild b/source.local/ap/lsscsi/lsscsi.SlackBuild
index 76e718e..96670ff 100755
--- a/source.local/ap/lsscsi/lsscsi.SlackBuild
+++ b/source.local/ap/lsscsi/lsscsi.SlackBuild
@@ -24,33 +24,35 @@
 
 
 PKGNAM=lsscsi
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.26}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "i486" ]; then
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  elif [ "$ARCH" = "s390" ]; then
+    SLKCFLAGS="-O2"
+  elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2 -fPIC"
+  else
+    SLKCFLAGS="-O2"
+  fi
 fi
 
 case "$ARCH" in
@@ -121,9 +123,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README \
+  AUTHORS COPYING CREDITS INSTALL NEWS README \
   $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
 #zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source.local/ap/mariadb/doinst.sh.gz b/source.local/ap/mariadb/doinst.sh.gz
new file mode 100644
index 0000000..471994c
--- /dev/null
+++ b/source.local/ap/mariadb/doinst.sh.gz
diff --git a/source.local/ap/mariadb/mariadb.SlackBuild b/source.local/ap/mariadb/mariadb.SlackBuild
new file mode 100755
index 0000000..85c68e2
--- /dev/null
+++ b/source.local/ap/mariadb/mariadb.SlackBuild
@@ -0,0 +1,201 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2012, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011, 2012, 2013  Heinz Wiesinger, Amsterdam, The Netherlands
+# 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.
+
+# Build and install MySQL on Slackware
+# by:  David Cantrell <david@slackware.com>
+# MariaDB conversion by:  Heinz Wiesinger <pprkut@liwjatan.at>
+# Also maintained by:  Patrick Volkerding <volkerdi@slackware.com>
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=mariadb
+VERSION=${VERSION:-5.5.30}
+BUILD=${BUILD:-1}
+
+# To reduce the package size, the embedded server my be omitted.  Currently
+# only amarok uses this.  To build without embedded support, set this to NO. 
+EMBEDDED=${EMBEDDED:-YES}
+
+# Add a description tag to the $BUILD.  This is used by
+# "build_embedded_package.sh" to mark packages containing the embedded server,
+# but can optionally be used with any kind of custom tag desired.
+TAG=${TAG:-}
+
+# Don't keep the large static libraries by default:
+KEEPSTATIC=${KEEPSTATIC:-NO}
+
+# Don't keep the test suite by default:
+KEEPTESTS=${KEEPTESTS:-NO}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf ${PKGNAM}-$VERSION
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
+cd ${PKGNAM}-$VERSION
+
+if ls $CWD/*.diff.gz 1> /dev/null 2> /dev/null ; then
+  for patch in $CWD/*.diff.gz ; do
+    zcat $patch | patch -p1 --verbose || exit 1
+  done
+fi
+
+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 {} \;
+
+mkdir build
+cd build
+cmake \
+  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS="$SLKCFLAGS -felide-constructors -fno-exceptions -fno-rtti" \
+  -DBUILD_CONFIG=mysql_release \
+  -DFEATURE_SET="community" \
+  -DINSTALL_LAYOUT="RPM" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DINSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \
+  -DINSTALL_SBINDIR=libexec \
+  -DINSTALL_INCLUDEDIR=include/mysql \
+  -DINSTALL_MYSQLSHAREDIR=share/mysql \
+  -DINSTALL_SQLBENCHDIR= \
+  -DINSTALL_MYSQLTESTDIR=mysql-test \
+  -DINSTALL_MANDIR=man \
+  -DINSTALL_PLUGINDIR="lib${LIBDIRSUFFIX}/mysql/plugin" \
+  -DINSTALL_SCRIPTDIR=bin \
+  -DINSTALL_SUPPORTFILESDIR=share/mysql \
+  -DINSTALL_MYSQLDATADIR="/var/lib/mysql" \
+  -DINSTALL_DOCREADMEDIR="doc/${PKGNAM}-$VERSION" \
+  -DINSTALL_DOCDIR="doc/${PKGNAM}-$VERSION" \
+  -DMYSQL_DATADIR="/var/lib/mysql" \
+  -DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \
+  -DWITH_EXTRA_CHARSETS=complex \
+  -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+  -DENABLED_LOCAL_INFILE=ON \
+  -DWITH_EMBEDDED_SERVER=${EMBEDDED} \
+  -DWITH_READLINE=ON \
+  -DWITH_SSL=system \
+  -DWITH_ZLIB=system \
+  -DUSE_ARIA_FOR_TMP_TABLES=ON \
+  -DMANUFACTURER="Slackware" \
+  ..
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG
+
+# Leave build directory:
+cd ..
+
+if [ "$KEEPSTATIC" = "NO" ]; then
+  # Remove large static libraries:
+  rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient.a
+  rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient_r.a
+  rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqld.a
+fi
+
+if [ "$KEEPTESTS" = "NO" ]; then
+  # Do not include the test suite:
+  rm -rf $PKG/usr/mysql-test
+fi
+
+# The ./configure option to omit this has gone away, so we'll omit it
+# the old-fashioned way.  It's all in the source tarball if you need it.
+rm -rf $PKG/usr/sql-bench
+
+# This is the directory where databases are stored
+mkdir -p $PKG/var/lib/mysql
+chown mysql.mysql $PKG/var/lib/mysql
+chmod 0750 $PKG/var/lib/mysql
+
+# This is where the socket is stored
+mkdir -p $PKG/var/run/mysql
+chown mysql.mysql $PKG/var/run/mysql
+chmod 0755 $PKG/var/run/mysql
+
+# Add init script:
+mkdir -p $PKG/etc/rc.d
+# This is installed chmod 644 so that the server does not run by default.
+zcat $CWD/rc.mysqld.gz > $PKG/etc/rc.d/rc.mysqld.new
+rm -rf $PKG/etc/init.d
+
+# Install mysqlaccess.conf
+install -m 644 scripts/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new
+
+# Mark config files under /etc as .new
+mv $PKG/etc/my.cnf $PKG/etc/my.cnf.new
+mv $PKG/etc/logrotate.d/mysql $PKG/etc/logrotate.d/mysql.new
+for i in client mysql-clients server; do
+  mv $PKG/etc/my.cnf.d/$i.cnf $PKG/etc/my.cnf.d/$i.cnf.new
+done
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-${BUILD}${TAG}.txz
+
diff --git a/source.local/ap/mariadb/mirror.url b/source.local/ap/mariadb/mirror.url
new file mode 100644
index 0000000..160c0c3
--- /dev/null
+++ b/source.local/ap/mariadb/mirror.url
@@ -0,0 +1 @@
+ftp://ftp.osuosl.org:/pub/mariadb/mariadb-5.5.30/kvm-tarbake-jaunty-x86/mariadb-5.5.30.tar.gz
diff --git a/source.local/ap/mariadb/rc.mysqld.gz b/source.local/ap/mariadb/rc.mysqld.gz
new file mode 100644
index 0000000..1a11baa
--- /dev/null
+++ b/source.local/ap/mariadb/rc.mysqld.gz
diff --git a/source.local/ap/mariadb/slack-desc b/source.local/ap/mariadb/slack-desc
new file mode 100644
index 0000000..867765f
--- /dev/null
+++ b/source.local/ap/mariadb/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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+mariadb: mariadb (Drop-in replacement for the MySQL Database Server)
+mariadb:
+mariadb: MariaDB is a backward compatible, drop-in replacement branch of the
+mariadb: MySQL(R) Database Server.  It includes all major open source storage
+mariadb: engines, including the Aria storage engine.
+mariadb:
+mariadb: Homepage: http://mariadb.org/
+mariadb:
+mariadb:
+mariadb:
+mariadb:
diff --git a/source.local/ap/mc/mc.SlackBuild b/source.local/ap/mc/mc.SlackBuild
index 84e06f2..44004a9 100755
--- a/source.local/ap/mc/mc.SlackBuild
+++ b/source.local/ap/mc/mc.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
@@ -23,33 +23,36 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo mc-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+PKGNAM=mc
+VERSION=${VERSION:-4.8.4}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "i486" ]; then
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  elif [ "$ARCH" = "s390" ]; then
+    SLKCFLAGS="-O2"
+  elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2 -fPIC"
+  else
+    SLKCFLAGS="-O2"
+  fi
 fi
 
 case "$ARCH" in
@@ -59,14 +62,14 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-mc
+PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr
 
 cd $TMP
-rm -rf mc-$VERSION
-tar xvf $CWD/mc-$VERSION.tar.xz || exit 1
-cd mc-$VERSION || exit 1
+rm -rf ${PKGNAM}-$VERSION
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || 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 \) \
@@ -74,8 +77,11 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Fix tmp path for saving files:
+zcat $CWD/mc.save.file.diff.gz | patch -p1 --verbose || exit 1
+
 # Use geeqie instead of gqview as an external image viewer:
-zcat $CWD/mc.ext.in.geeqie.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/mc.image.sh.geeqie.diff.gz | patch -p1 --verbose || exit 1
 
 if [ ! -x ./configure ]; then
   ./autogen.sh
@@ -87,7 +93,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --localstatedir=/var \
-  --docdir=/usr/doc/mc-$VERSION \
+  --docdir=/usr/doc/${PKGNAM}-$VERSION \
   --enable-extcharset \
   --enable-netcode \
   --enable-background \
@@ -117,17 +123,29 @@ cp -a $CWD/profile.d/mc.* $PKG/etc/profile.d
 chown root:root $PKG/etc/profile.d/*
 chmod 755 $PKG/etc/profile.d/*
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
-mkdir -p $PKG/usr/doc/mc-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS doc/COPYING* doc/FAQ doc/HACKING doc/INSTALL doc/MAINTAINERS doc/NEWS doc/README* doc/TODO \
-  $PKG/usr/doc/mc-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/mc-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source.local/ap/mc/mc.ext.in.geeqie.diff.gz b/source.local/ap/mc/mc.ext.in.geeqie.diff.gz
deleted file mode 100644
index 03225d9..0000000
--- a/source.local/ap/mc/mc.ext.in.geeqie.diff.gz
+++ /dev/null
diff --git a/source.local/ap/mc/mc.image.sh.geeqie.diff.gz b/source.local/ap/mc/mc.image.sh.geeqie.diff.gz
new file mode 100644
index 0000000..493e5e3
--- /dev/null
+++ b/source.local/ap/mc/mc.image.sh.geeqie.diff.gz
diff --git a/source.local/ap/mc/mc.save.file.diff.gz b/source.local/ap/mc/mc.save.file.diff.gz
new file mode 100644
index 0000000..1b0d4ce
--- /dev/null
+++ b/source.local/ap/mc/mc.save.file.diff.gz
diff --git a/source.local/ap/mpg123/mpg123.SlackBuild b/source.local/ap/mpg123/mpg123.SlackBuild
index 61cc066..02c515f 100755
--- a/source.local/ap/mpg123/mpg123.SlackBuild
+++ b/source.local/ap/mpg123/mpg123.SlackBuild
@@ -23,54 +23,60 @@
 
 
 PKGNAM=mpg123
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.14.4}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
   CPUTARGET="x86"
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
   CPUTARGET=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
   CPUTARGET="x86-64"
 elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
   CPUTARGET="arm_nofpu"
 elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
   CPUTARGET="generic_fpu"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
   CPUTARGET="generic_fpu"
 fi
 
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
 # configure --help shows the following re TARGET:
 # --with-cpu=i386_fpu		Use code optimized for i386 processors with floating point arithmetic
 # --with-cpu=i386_nofpu		Use code optimized for i386 processors with fixed point arithmetic (experimental)
diff --git a/source.local/ap/mysql/doinst.sh.gz b/source.local/ap/mysql/doinst.sh.gz
deleted file mode 100644
index ed921e2..0000000
--- a/source.local/ap/mysql/doinst.sh.gz
+++ /dev/null
diff --git a/source.local/ap/mysql/mysql-embedded.build b/source.local/ap/mysql/mysql-embedded.build
deleted file mode 100755
index cd7a8c2..0000000
--- a/source.local/ap/mysql/mysql-embedded.build
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-# Build and install MySQL on Slackware
-# by:  David Cantrell <david@slackware.com>
-# Currently maintained by:  Patrick Volkerding <volkerdi@slackware.com>
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
-VERSION=${VERSION:-$(echo mysql-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-mysql
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf mysql-$VERSION
-tar xvf $CWD/mysql-$VERSION.tar.?z* || exit 1
-cd mysql-$VERSION
-
-if ls $CWD/*.diff.gz 1> /dev/null 2> /dev/null ; then
-  for patch in $CWD/*.diff.gz ; do
-    zcat $patch | patch -p1 --verbose || exit 1
-  done
-fi
-
-CFLAGS="$SLKCFLAGS -fPIC" CXXFLAGS="$SLKCFLAGS -fPIC" \
-    ./configure --prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --datadir=/usr/share --sysconfdir=/etc/mysql \
-    --libexecdir=/usr/sbin --localstatedir=/var/lib/mysql \
-    --without-docs --without-man --without-server \
-    --with-embedded-server \
-    --without-readline --disable-shared --with-charset=utf8 \
-    --without-debug --with-pthread --without-ssl --without-query-cache \
-    --without-geometry --with-pic
-
-make -j6 || make || exit 1
-
-cp libmysqld/libmysqld.a /usr/lib${LIBDIRSUFFIX}/mysql/
-
diff --git a/source.local/ap/mysql/mysql.SlackBuild b/source.local/ap/mysql/mysql.SlackBuild
deleted file mode 100755
index 2103f76..0000000
--- a/source.local/ap/mysql/mysql.SlackBuild
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, 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.
-
-# Build and install MySQL on Slackware
-# by:  David Cantrell <david@slackware.com>
-# Currently maintained by:  Patrick Volkerding <volkerdi@slackware.com>
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
-PKGNAM=mysql
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-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
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION
-
-if ls $CWD/*.diff.gz 1> /dev/null 2> /dev/null ; then
-  for patch in $CWD/*.diff.gz ; do
-    zcat $patch | patch -p1 --verbose || exit 1
-  done
-fi
-
-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 -felide-constructors -fno-exceptions -fno-rtti" \
-CXX=gcc \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-mysqld-user=mysql \
-  --with-unix-socket-path=/var/run/mysql/mysql.sock \
-  --localstatedir=/var/lib/mysql \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --enable-assembler \
-  --without-debug \
-  --enable-thread-safe-client \
-  --with-extra-charsets=complex \
-  --with-ssl=/usr \
-  --enable-largefile \
-  --with-innodb \
-  --with-readline \
-  --build=$TARGET
-#
-# --without-readline
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
-
-# install additional headers needed for building external engine plugins
-for i in sql include regex; do
-  for j in $i/*.h; do
-    install -m 644 $j $PKG/usr/include/mysql/
-  done
-done
-
-mkdir -p $PKG/usr/include/mysql/atomic
-for i in include/atomic/*.h; do
-  install -m 644 $i $PKG/usr/include/mysql/atomic/
-done
-
-# The ./configure option to omit this has gone away, so we'll omit it
-# the old-fashioned way.  It's all in the source tarball if you need it.
-rm -rf $PKG/usr/sql-bench
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Install support files
-mkdir -p $PKG/etc
-cp support-files/my-{huge,large,medium,small}.cnf $PKG/etc
-
-# Install docs
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/Docs
-cp -a \
-  COPYING* EXCEPTIONS* INSTALL-SOURCE README* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-( cd Docs
-  # Seems most of the Docs/* are gone, but we'll leave the cp stuff
-  # in case it returns.
-  cp -a INSTALL-BINARY *.html *.txt Flags \
-     $PKG/usr/doc/$PKGNAM-$VERSION/Docs )
-## Too large to justify since the .html version is right there:
-#rm $PKG/usr/doc/$PKGNAM-$VERSION/Docs/manual.txt
-find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \;
-
-# This is the directory where databases are stored
-mkdir -p $PKG/var/lib/mysql
-chown mysql.mysql $PKG/var/lib/mysql
-chmod 0750 $PKG/var/lib/mysql
-
-# This is where the socket is stored
-mkdir -p $PKG/var/run/mysql
-chown mysql.mysql $PKG/var/run/mysql
-chmod 0755 $PKG/var/run/mysql
-
-# Do not include the test suite:
-rm -rf $PKG/usr/mysql-test
-
-# Add init script:
-mkdir -p $PKG/etc/rc.d
-# This is intentionally chmod 644.
-zcat $CWD/rc.mysqld.gz > $PKG/etc/rc.d/rc.mysqld.new
-
-# Install script:
-mkdir -p $PKG/install
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Add some handy library symlinks:
-if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/mysql/libmysqlclient.so.16 ]; then
-  ( cd $PKG/usr/lib${LIBDIRSUFFIX}
-    rm -f libmysqlclient.so libmysqlclient.so.16
-    ln -sf mysql/libmysqlclient.so .
-    ln -sf mysql/libmysqlclient.so.16 .
-  )
-else
-  exit 1
-fi
-if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/mysql/libmysqlclient_r.so.16 ]; then
-  ( cd $PKG/usr/lib${LIBDIRSUFFIX}
-    rm -f libmysqlclient_r.so libmysqlclient_r.so.16
-    ln -sf mysql/libmysqlclient_r.so .
-    ln -sf mysql/libmysqlclient_r.so.16 .
-  )
-else
-  exit 1
-fi
-
-# Packaging standards:
-rm -f $PKG/usr/info/dir
-
-# Compress and link manpages, if any:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-# Compress info files, if any:
-if [ -d $PKG/usr/info ]; then
-  ( cd $PKG/usr/info
-    rm -f dir
-    gzip -9 *
-  )
-fi
-
-# 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
-
-# Build package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source.local/ap/mysql/rc.mysqld.gz b/source.local/ap/mysql/rc.mysqld.gz
deleted file mode 100644
index 2f95406..0000000
--- a/source.local/ap/mysql/rc.mysqld.gz
+++ /dev/null
diff --git a/source.local/ap/mysql/slack-desc b/source.local/ap/mysql/slack-desc
deleted file mode 100644
index 29e1b8b..0000000
--- a/source.local/ap/mysql/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------------------------------------------------------|
-mysql: mysql (SQL-based relational database server)
-mysql:
-mysql: MySQL is a fast, multi-threaded, multi-user, and robust SQL
-mysql: (Structured Query Language) database server.  It comes with a nice API
-mysql: which makes it easy to integrate into other applications.
-mysql:
-mysql: The home page for MySQL is http://www.mysql.com/
-mysql:
-mysql:
-mysql:
-mysql:
diff --git a/source.local/ap/powertop/powertop.SlackBuild b/source.local/ap/powertop/powertop.SlackBuild
index ea6cf6a..e11ed85 100755
--- a/source.local/ap/powertop/powertop.SlackBuild
+++ b/source.local/ap/powertop/powertop.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,40 +20,46 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by Willy Sudiarto Raharjo
+# Changelog
+# May, 11 : Bumped to 2.0, Fix compilation process, Added patch to fix complaints about a file
+# May, 18 : Rebuilt, removed non-existence directory for man pages
+
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=powertop
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
@@ -75,21 +81,45 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+LDFLAGS=" -ltinfo -lresolv -lz " \
+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
+
 # Build and install:
-make || exit 1
+make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Move man pages:
-mv $PKG/usr/share/man $PKG/usr
-
 # 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
 
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  COPYING* README* \
+  COPYING* README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source.local/ap/rpm/rpm.SlackBuild b/source.local/ap/rpm/rpm.SlackBuild
index a6c37d0..73c5984 100755
--- a/source.local/ap/rpm/rpm.SlackBuild
+++ b/source.local/ap/rpm/rpm.SlackBuild
@@ -26,46 +26,45 @@
 # Build RPM (of all things) for Slackware.
 
 PKGNAM=rpm
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-4.10.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-SEAMONKEY_NSPR=${SEAMONKEY_NSPR:-yes} # set to 'no' if you use mozilla-nss
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  elif [ "$ARCH" = "arm" ]; then
+    SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+    LIBDIRSUFFIX=""
+  elif [ "$ARCH" = "armel" ]; then
+    SLKCFLAGS="-O2 -march=armv4t"
+    LIBDIRSUFFIX=""
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -73,16 +72,7 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
-if [ "$SEAMONKEY_NSPR" = "yes" -o "$SEAMONKEY_NSPR" = "YES" ]; then
-  NSS_INC="/usr/include/seamonkey/nss"
-  NSPR_INC="/usr/include/seamonkey/nspr"
-  NSS_LIBS="/usr/lib${LIBDIRSUFFIX}/seamonkey"
-else
-  NSS_INC="/usr/include/nss"
-  NSPR_INC="/usr/include/nspr"
-  NSS_LIBS="/usr/lib${LIBDIRSUFFIX}"
-fi
-DB_INC="/usr/include/db44"
+DB_INC="/usr/include/db48"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -97,7 +87,7 @@ xz -dc $CWD/rpm-$VERSION.tar.xz | tar xvf - || exit 1
 cd rpm-$VERSION
 
 # Or else ARM compilation fails:
-zcat $CWD/rpm.installplatform_arm.patch.gz | patch -p1 --verbose || exit 1
+#zcat $CWD/rpm.installplatform_arm.patch.gz | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
@@ -106,11 +96,11 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# We have to tell it where to find Seamonkey's NSS.
+# We have to tell it where to find NSS and NSPR
 # Also, --enable-sqlite3 needs "-ldl" in LDFLAGS
 # And --enable-broken-chown fits, as ours follows symlinks.
-CFLAGS="$SLKCFLAGS -I$NSS_INC -I$NSPR_INC -I$DB_INC" \
-LDFLAGS="-L${NSS_LIBS} -ldl" \
+CFLAGS="$SLKCFLAGS -I${DB_INC} $(pkg-config --cflags nspr nss)" \
+LDFLAGS="-ldl" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/source.local/ap/rpm/rpm.installplatform_arm.patch.gz b/source.local/ap/rpm/rpm.installplatform_arm.patch.gz
index a8c0aa2..5b44ec9 100644
--- a/source.local/ap/rpm/rpm.installplatform_arm.patch.gz
+++ b/source.local/ap/rpm/rpm.installplatform_arm.patch.gz
diff --git a/source.local/ap/soma/slack-desc b/source.local/ap/soma/slack-desc
index bed6100..bc1725a 100644
--- a/source.local/ap/soma/slack-desc
+++ b/source.local/ap/soma/slack-desc
@@ -8,10 +8,10 @@
     |-----handy-ruler------------------------------------------------------|
 soma: Soma - a command line/dialog internet radio player
 soma:
-soma: Soma is a front end for mplayer to play radio playlists pls,m3u and 
-soma: ram.  More will be added as it progresses.
+soma: Soma is a frontend for mplayer to play radio playlists pls,m3u and 
+soma: ram. More will be added as it progresses.
 soma:
-soma: Homepage: http://www.dawoodfall.net/slackbuilds/13.0/soma
+soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma
 soma:
 soma:
 soma:
diff --git a/source.local/ap/soma/soma.SlackBuild b/source.local/ap/soma/soma.SlackBuild
index 76ca6a8..c7cc38a 100755
--- a/source.local/ap/soma/soma.SlackBuild
+++ b/source.local/ap/soma/soma.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for soma
 # Copyright 2010-2011 David Woodfall <dave@dawoodfall.net>
-# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=soma
-VERSION=${VERSION:-2.7.1}
+VERSION=${VERSION:-2.8.5}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-}
diff --git a/source.local/ap/soma/soma.info b/source.local/ap/soma/soma.info
index 24386ad..0255d3d 100644
--- a/source.local/ap/soma/soma.info
+++ b/source.local/ap/soma/soma.info
@@ -1,8 +1,8 @@
 PRGNAM="soma"
-VERSION="2.7"
-HOMEPAGE="http://www.dawoodfall.net/slackbuilds/noversion/soma/"
-DOWNLOAD="http://www.dawoodfall.net/slackbuilds/noversion/soma/soma-2.7.tar.gz"
-MD5SUM="8fc3f963da774625ce1ec7fb84bc096e"
+VERSION="2.8.5"
+HOMEPAGE="http://www.dawoodfall.net/files/slackbuilds/noversion/soma/"
+DOWNLOAD="http://www.dawoodfall.net/files/slackbuilds/noversion/soma/soma-2.8.5.tar.gz"
+MD5SUM="193112a1dc8de8781b83d3a1bceedee6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
diff --git a/source.local/ap/sox/sox.SlackBuild b/source.local/ap/sox/sox.SlackBuild
index dcda1ef..6143ddd 100755
--- a/source.local/ap/sox/sox.SlackBuild
+++ b/source.local/ap/sox/sox.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
@@ -24,38 +24,39 @@
 
 
 PKGNAM=sox
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-14.4.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/ap/sudo/sudo-1.7.4p6.tar.gz.sig b/source.local/ap/sudo/sudo-1.7.4p6.tar.gz.sig
deleted file mode 100644
index 7c248a7..0000000
--- a/source.local/ap/sudo/sudo-1.7.4p6.tar.gz.sig
+++ /dev/null
diff --git a/source.local/ap/sudo/sudo.SlackBuild b/source.local/ap/sudo/sudo.SlackBuild
index e3faea4..ed5fae1 100755
--- a/source.local/ap/sudo/sudo.SlackBuild
+++ b/source.local/ap/sudo/sudo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,35 +24,39 @@
 
 
 PKGNAM=sudo
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.8.6p7}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -68,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG/var/{lib,db}
 cd $TMP
 rm -rf sudo-$VERSION
-tar xvf $CWD/sudo-$VERSION.tar.gz || exit 1
+tar xvf $CWD/sudo-$VERSION.tar.?z* || exit 1
 cd sudo-$VERSION
 
 chown -R root:root .
@@ -111,8 +115,8 @@ mv $PKG/etc/sudoers $PKG/etc/sudoers.new
 rm -r $PKG/usr/doc/sudo-$VERSION
 mkdir -p $PKG/usr/doc/sudo-$VERSION
 cp -a \
-  BUGS HISTORY INSTALL LICENSE PORTING README* \
-  RUNSON TODO TROUBLESHOOTING UPGRADE WHATSNEW \
+  INSTALL NEWS README* \
+  doc/{CONTRIBUTORS,HISTORY,LICENSE,TROUBLESHOOTING,UPGRADE} \
   $PKG/usr/doc/sudo-$VERSION
 chmod 644 $PKG/usr/doc/sudo-$VERSION/*
 
diff --git a/source.local/ap/terminus-font/doinst.sh.gz b/source.local/ap/terminus-font/doinst.sh.gz
new file mode 100644
index 0000000..c3475f7
--- /dev/null
+++ b/source.local/ap/terminus-font/doinst.sh.gz
diff --git a/source.local/ap/terminus-font/slack-desc b/source.local/ap/terminus-font/slack-desc
new file mode 100644
index 0000000..c168bf5
--- /dev/null
+++ b/source.local/ap/terminus-font/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 ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+terminus-font: terminus-font (a clean fixed width font)
+terminus-font:
+terminus-font: Terminus Font is designed for long (8 and more hours per day)
+terminus-font: work with computers.  It is a good choice if you run a Unicode-enabled
+terminus-font: console but the package also contains a non-scalable Unicode-enabled
+terminus-font: font for use in X terminal applications.
+terminus-font:
+terminus-font:
+terminus-font:
+terminus-font: terminus-font home: http://terminus-font.sourceforge.net
+terminus-font:
diff --git a/source.local/ap/terminus-font/terminus-font.Makefile.paths.diff.gz b/source.local/ap/terminus-font/terminus-font.Makefile.paths.diff.gz
new file mode 100644
index 0000000..8a7a235
--- /dev/null
+++ b/source.local/ap/terminus-font/terminus-font.Makefile.paths.diff.gz
diff --git a/source.local/ap/terminus-font/terminus-font.SlackBuild b/source.local/ap/terminus-font/terminus-font.SlackBuild
new file mode 100755
index 0000000..a7ea579
--- /dev/null
+++ b/source.local/ap/terminus-font/terminus-font.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Copyright 2013  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=terminus-font
+VERSION=${VERSION:-4.38}
+BUILD=${BUILD:-1}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+zcat $CWD/terminus-font.Makefile.paths.diff.gz | patch -p1 --verbose || 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 {} \;
+
+make || exit 1
+make install install-uni install-ref DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS CHANGES COPYING* INSTALL NEWS OFL.TXT README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+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-noarch-$BUILD.txz
+
diff --git a/source.local/ap/vim/patches/7.3.155.gz b/source.local/ap/vim/patches/7.3.155.gz
new file mode 100644
index 0000000..c83cc35
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.155.gz
diff --git a/source.local/ap/vim/patches/7.3.156.gz b/source.local/ap/vim/patches/7.3.156.gz
new file mode 100644
index 0000000..6448119
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.156.gz
diff --git a/source.local/ap/vim/patches/7.3.157.gz b/source.local/ap/vim/patches/7.3.157.gz
new file mode 100644
index 0000000..5e7a5d1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.157.gz
diff --git a/source.local/ap/vim/patches/7.3.158.gz b/source.local/ap/vim/patches/7.3.158.gz
new file mode 100644
index 0000000..1348da0
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.158.gz
diff --git a/source.local/ap/vim/patches/7.3.159.gz b/source.local/ap/vim/patches/7.3.159.gz
new file mode 100644
index 0000000..7ea6205
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.159.gz
diff --git a/source.local/ap/vim/patches/7.3.160.gz b/source.local/ap/vim/patches/7.3.160.gz
new file mode 100644
index 0000000..86658f3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.160.gz
diff --git a/source.local/ap/vim/patches/7.3.161.gz b/source.local/ap/vim/patches/7.3.161.gz
new file mode 100644
index 0000000..a0aa8f0
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.161.gz
diff --git a/source.local/ap/vim/patches/7.3.162.gz b/source.local/ap/vim/patches/7.3.162.gz
new file mode 100644
index 0000000..d7e0302
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.162.gz
diff --git a/source.local/ap/vim/patches/7.3.163.gz b/source.local/ap/vim/patches/7.3.163.gz
new file mode 100644
index 0000000..fa36a7d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.163.gz
diff --git a/source.local/ap/vim/patches/7.3.164.gz b/source.local/ap/vim/patches/7.3.164.gz
new file mode 100644
index 0000000..dfaf1e8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.164.gz
diff --git a/source.local/ap/vim/patches/7.3.165.gz b/source.local/ap/vim/patches/7.3.165.gz
new file mode 100644
index 0000000..be22ead
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.165.gz
diff --git a/source.local/ap/vim/patches/7.3.166.gz b/source.local/ap/vim/patches/7.3.166.gz
new file mode 100644
index 0000000..39c3ea1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.166.gz
diff --git a/source.local/ap/vim/patches/7.3.167.gz b/source.local/ap/vim/patches/7.3.167.gz
new file mode 100644
index 0000000..e05bf12
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.167.gz
diff --git a/source.local/ap/vim/patches/7.3.168.gz b/source.local/ap/vim/patches/7.3.168.gz
new file mode 100644
index 0000000..1406af4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.168.gz
diff --git a/source.local/ap/vim/patches/7.3.169.gz b/source.local/ap/vim/patches/7.3.169.gz
new file mode 100644
index 0000000..14bd80d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.169.gz
diff --git a/source.local/ap/vim/patches/7.3.170.gz b/source.local/ap/vim/patches/7.3.170.gz
new file mode 100644
index 0000000..0048fbe
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.170.gz
diff --git a/source.local/ap/vim/patches/7.3.171.gz b/source.local/ap/vim/patches/7.3.171.gz
new file mode 100644
index 0000000..dac2ace
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.171.gz
diff --git a/source.local/ap/vim/patches/7.3.172.gz b/source.local/ap/vim/patches/7.3.172.gz
new file mode 100644
index 0000000..35dca54
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.172.gz
diff --git a/source.local/ap/vim/patches/7.3.173.gz b/source.local/ap/vim/patches/7.3.173.gz
new file mode 100644
index 0000000..02c9251
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.173.gz
diff --git a/source.local/ap/vim/patches/7.3.174.gz b/source.local/ap/vim/patches/7.3.174.gz
new file mode 100644
index 0000000..42afcf5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.174.gz
diff --git a/source.local/ap/vim/patches/7.3.175.gz b/source.local/ap/vim/patches/7.3.175.gz
new file mode 100644
index 0000000..b235fe2
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.175.gz
diff --git a/source.local/ap/vim/patches/7.3.176.gz b/source.local/ap/vim/patches/7.3.176.gz
new file mode 100644
index 0000000..892c704
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.176.gz
diff --git a/source.local/ap/vim/patches/7.3.177.gz b/source.local/ap/vim/patches/7.3.177.gz
new file mode 100644
index 0000000..cff9f4d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.177.gz
diff --git a/source.local/ap/vim/patches/7.3.178.gz b/source.local/ap/vim/patches/7.3.178.gz
new file mode 100644
index 0000000..cbcb366
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.178.gz
diff --git a/source.local/ap/vim/patches/7.3.179.gz b/source.local/ap/vim/patches/7.3.179.gz
new file mode 100644
index 0000000..173723a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.179.gz
diff --git a/source.local/ap/vim/patches/7.3.180.gz b/source.local/ap/vim/patches/7.3.180.gz
new file mode 100644
index 0000000..fbf3da3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.180.gz
diff --git a/source.local/ap/vim/patches/7.3.181.gz b/source.local/ap/vim/patches/7.3.181.gz
new file mode 100644
index 0000000..9ebfbd8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.181.gz
diff --git a/source.local/ap/vim/patches/7.3.182.gz b/source.local/ap/vim/patches/7.3.182.gz
new file mode 100644
index 0000000..4a207d4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.182.gz
diff --git a/source.local/ap/vim/patches/7.3.183.gz b/source.local/ap/vim/patches/7.3.183.gz
new file mode 100644
index 0000000..7f8ea4e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.183.gz
diff --git a/source.local/ap/vim/patches/7.3.184.gz b/source.local/ap/vim/patches/7.3.184.gz
new file mode 100644
index 0000000..b9b814c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.184.gz
diff --git a/source.local/ap/vim/patches/7.3.185.gz b/source.local/ap/vim/patches/7.3.185.gz
new file mode 100644
index 0000000..4e4148f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.185.gz
diff --git a/source.local/ap/vim/patches/7.3.186.gz b/source.local/ap/vim/patches/7.3.186.gz
new file mode 100644
index 0000000..66f6e6b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.186.gz
diff --git a/source.local/ap/vim/patches/7.3.187.gz b/source.local/ap/vim/patches/7.3.187.gz
new file mode 100644
index 0000000..c40a7f4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.187.gz
diff --git a/source.local/ap/vim/patches/7.3.188.gz b/source.local/ap/vim/patches/7.3.188.gz
new file mode 100644
index 0000000..e379beb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.188.gz
diff --git a/source.local/ap/vim/patches/7.3.189.gz b/source.local/ap/vim/patches/7.3.189.gz
new file mode 100644
index 0000000..99d15b5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.189.gz
diff --git a/source.local/ap/vim/patches/7.3.190.gz b/source.local/ap/vim/patches/7.3.190.gz
new file mode 100644
index 0000000..3041885
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.190.gz
diff --git a/source.local/ap/vim/patches/7.3.191.gz b/source.local/ap/vim/patches/7.3.191.gz
new file mode 100644
index 0000000..9feec85
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.191.gz
diff --git a/source.local/ap/vim/patches/7.3.192.gz b/source.local/ap/vim/patches/7.3.192.gz
new file mode 100644
index 0000000..4a169ad
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.192.gz
diff --git a/source.local/ap/vim/patches/7.3.193.gz b/source.local/ap/vim/patches/7.3.193.gz
new file mode 100644
index 0000000..81648dd
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.193.gz
diff --git a/source.local/ap/vim/patches/7.3.194.gz b/source.local/ap/vim/patches/7.3.194.gz
new file mode 100644
index 0000000..0f013ad
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.194.gz
diff --git a/source.local/ap/vim/patches/7.3.195.gz b/source.local/ap/vim/patches/7.3.195.gz
new file mode 100644
index 0000000..8efb517
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.195.gz
diff --git a/source.local/ap/vim/patches/7.3.196.gz b/source.local/ap/vim/patches/7.3.196.gz
new file mode 100644
index 0000000..fda88d8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.196.gz
diff --git a/source.local/ap/vim/patches/7.3.197.gz b/source.local/ap/vim/patches/7.3.197.gz
new file mode 100644
index 0000000..772d181
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.197.gz
diff --git a/source.local/ap/vim/patches/7.3.198.gz b/source.local/ap/vim/patches/7.3.198.gz
new file mode 100644
index 0000000..9edd744
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.198.gz
diff --git a/source.local/ap/vim/patches/7.3.199.gz b/source.local/ap/vim/patches/7.3.199.gz
new file mode 100644
index 0000000..d577911
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.199.gz
diff --git a/source.local/ap/vim/patches/7.3.200.gz b/source.local/ap/vim/patches/7.3.200.gz
new file mode 100644
index 0000000..1e7fcc5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.200.gz
diff --git a/source.local/ap/vim/patches/7.3.201.gz b/source.local/ap/vim/patches/7.3.201.gz
new file mode 100644
index 0000000..b69ddca
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.201.gz
diff --git a/source.local/ap/vim/patches/7.3.202.gz b/source.local/ap/vim/patches/7.3.202.gz
new file mode 100644
index 0000000..b3b0f8f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.202.gz
diff --git a/source.local/ap/vim/patches/7.3.203.gz b/source.local/ap/vim/patches/7.3.203.gz
new file mode 100644
index 0000000..2d37014
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.203.gz
diff --git a/source.local/ap/vim/patches/7.3.204.gz b/source.local/ap/vim/patches/7.3.204.gz
new file mode 100644
index 0000000..a64758b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.204.gz
diff --git a/source.local/ap/vim/patches/7.3.205.gz b/source.local/ap/vim/patches/7.3.205.gz
new file mode 100644
index 0000000..1900ee3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.205.gz
diff --git a/source.local/ap/vim/patches/7.3.206.gz b/source.local/ap/vim/patches/7.3.206.gz
new file mode 100644
index 0000000..ab333cc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.206.gz
diff --git a/source.local/ap/vim/patches/7.3.207.gz b/source.local/ap/vim/patches/7.3.207.gz
new file mode 100644
index 0000000..a9e2c16
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.207.gz
diff --git a/source.local/ap/vim/patches/7.3.208.gz b/source.local/ap/vim/patches/7.3.208.gz
new file mode 100644
index 0000000..9959ad7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.208.gz
diff --git a/source.local/ap/vim/patches/7.3.209.gz b/source.local/ap/vim/patches/7.3.209.gz
new file mode 100644
index 0000000..ba8de80
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.209.gz
diff --git a/source.local/ap/vim/patches/7.3.210.gz b/source.local/ap/vim/patches/7.3.210.gz
new file mode 100644
index 0000000..518965a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.210.gz
diff --git a/source.local/ap/vim/patches/7.3.211.gz b/source.local/ap/vim/patches/7.3.211.gz
new file mode 100644
index 0000000..6d54070
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.211.gz
diff --git a/source.local/ap/vim/patches/7.3.212.gz b/source.local/ap/vim/patches/7.3.212.gz
new file mode 100644
index 0000000..56dc406
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.212.gz
diff --git a/source.local/ap/vim/patches/7.3.213.gz b/source.local/ap/vim/patches/7.3.213.gz
new file mode 100644
index 0000000..e747a6f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.213.gz
diff --git a/source.local/ap/vim/patches/7.3.214.gz b/source.local/ap/vim/patches/7.3.214.gz
new file mode 100644
index 0000000..3df0b80
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.214.gz
diff --git a/source.local/ap/vim/patches/7.3.215.gz b/source.local/ap/vim/patches/7.3.215.gz
new file mode 100644
index 0000000..b4d8f3b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.215.gz
diff --git a/source.local/ap/vim/patches/7.3.216.gz b/source.local/ap/vim/patches/7.3.216.gz
new file mode 100644
index 0000000..3a2cbde
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.216.gz
diff --git a/source.local/ap/vim/patches/7.3.217.gz b/source.local/ap/vim/patches/7.3.217.gz
new file mode 100644
index 0000000..2171b5b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.217.gz
diff --git a/source.local/ap/vim/patches/7.3.218.gz b/source.local/ap/vim/patches/7.3.218.gz
new file mode 100644
index 0000000..23a046c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.218.gz
diff --git a/source.local/ap/vim/patches/7.3.219.gz b/source.local/ap/vim/patches/7.3.219.gz
new file mode 100644
index 0000000..43b95dd
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.219.gz
diff --git a/source.local/ap/vim/patches/7.3.220.gz b/source.local/ap/vim/patches/7.3.220.gz
new file mode 100644
index 0000000..9a6c0a7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.220.gz
diff --git a/source.local/ap/vim/patches/7.3.221.gz b/source.local/ap/vim/patches/7.3.221.gz
new file mode 100644
index 0000000..175058c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.221.gz
diff --git a/source.local/ap/vim/patches/7.3.222.gz b/source.local/ap/vim/patches/7.3.222.gz
new file mode 100644
index 0000000..737db77
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.222.gz
diff --git a/source.local/ap/vim/patches/7.3.223.gz b/source.local/ap/vim/patches/7.3.223.gz
new file mode 100644
index 0000000..6bda8ab
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.223.gz
diff --git a/source.local/ap/vim/patches/7.3.224.gz b/source.local/ap/vim/patches/7.3.224.gz
new file mode 100644
index 0000000..81b1e9d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.224.gz
diff --git a/source.local/ap/vim/patches/7.3.225.gz b/source.local/ap/vim/patches/7.3.225.gz
new file mode 100644
index 0000000..1157b1e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.225.gz
diff --git a/source.local/ap/vim/patches/7.3.226.gz b/source.local/ap/vim/patches/7.3.226.gz
new file mode 100644
index 0000000..c428c76
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.226.gz
diff --git a/source.local/ap/vim/patches/7.3.227.gz b/source.local/ap/vim/patches/7.3.227.gz
new file mode 100644
index 0000000..786174c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.227.gz
diff --git a/source.local/ap/vim/patches/7.3.228.gz b/source.local/ap/vim/patches/7.3.228.gz
new file mode 100644
index 0000000..8afc41b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.228.gz
diff --git a/source.local/ap/vim/patches/7.3.229.gz b/source.local/ap/vim/patches/7.3.229.gz
new file mode 100644
index 0000000..ca64c5f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.229.gz
diff --git a/source.local/ap/vim/patches/7.3.230.gz b/source.local/ap/vim/patches/7.3.230.gz
new file mode 100644
index 0000000..59c238e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.230.gz
diff --git a/source.local/ap/vim/patches/7.3.231.gz b/source.local/ap/vim/patches/7.3.231.gz
new file mode 100644
index 0000000..38c419d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.231.gz
diff --git a/source.local/ap/vim/patches/7.3.232.gz b/source.local/ap/vim/patches/7.3.232.gz
new file mode 100644
index 0000000..8399957
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.232.gz
diff --git a/source.local/ap/vim/patches/7.3.233.gz b/source.local/ap/vim/patches/7.3.233.gz
new file mode 100644
index 0000000..d922337
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.233.gz
diff --git a/source.local/ap/vim/patches/7.3.234.gz b/source.local/ap/vim/patches/7.3.234.gz
new file mode 100644
index 0000000..5195308
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.234.gz
diff --git a/source.local/ap/vim/patches/7.3.235.gz b/source.local/ap/vim/patches/7.3.235.gz
new file mode 100644
index 0000000..4dbc6eb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.235.gz
diff --git a/source.local/ap/vim/patches/7.3.236.gz b/source.local/ap/vim/patches/7.3.236.gz
new file mode 100644
index 0000000..e20852e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.236.gz
diff --git a/source.local/ap/vim/patches/7.3.237.gz b/source.local/ap/vim/patches/7.3.237.gz
new file mode 100644
index 0000000..c7f78d5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.237.gz
diff --git a/source.local/ap/vim/patches/7.3.238.gz b/source.local/ap/vim/patches/7.3.238.gz
new file mode 100644
index 0000000..f1d0cae
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.238.gz
diff --git a/source.local/ap/vim/patches/7.3.239.gz b/source.local/ap/vim/patches/7.3.239.gz
new file mode 100644
index 0000000..318df8a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.239.gz
diff --git a/source.local/ap/vim/patches/7.3.240.gz b/source.local/ap/vim/patches/7.3.240.gz
new file mode 100644
index 0000000..e30b9d8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.240.gz
diff --git a/source.local/ap/vim/patches/7.3.241.gz b/source.local/ap/vim/patches/7.3.241.gz
new file mode 100644
index 0000000..c56a7aa
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.241.gz
diff --git a/source.local/ap/vim/patches/7.3.242.gz b/source.local/ap/vim/patches/7.3.242.gz
new file mode 100644
index 0000000..fab888c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.242.gz
diff --git a/source.local/ap/vim/patches/7.3.243.gz b/source.local/ap/vim/patches/7.3.243.gz
new file mode 100644
index 0000000..3ffea7e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.243.gz
diff --git a/source.local/ap/vim/patches/7.3.244.gz b/source.local/ap/vim/patches/7.3.244.gz
new file mode 100644
index 0000000..ba36251
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.244.gz
diff --git a/source.local/ap/vim/patches/7.3.245.gz b/source.local/ap/vim/patches/7.3.245.gz
new file mode 100644
index 0000000..21e2bc3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.245.gz
diff --git a/source.local/ap/vim/patches/7.3.246.gz b/source.local/ap/vim/patches/7.3.246.gz
new file mode 100644
index 0000000..a4b00e5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.246.gz
diff --git a/source.local/ap/vim/patches/7.3.247.gz b/source.local/ap/vim/patches/7.3.247.gz
new file mode 100644
index 0000000..7d0c420
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.247.gz
diff --git a/source.local/ap/vim/patches/7.3.248.gz b/source.local/ap/vim/patches/7.3.248.gz
new file mode 100644
index 0000000..a1c556a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.248.gz
diff --git a/source.local/ap/vim/patches/7.3.249.gz b/source.local/ap/vim/patches/7.3.249.gz
new file mode 100644
index 0000000..91b6b76
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.249.gz
diff --git a/source.local/ap/vim/patches/7.3.250.gz b/source.local/ap/vim/patches/7.3.250.gz
new file mode 100644
index 0000000..c9b2adc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.250.gz
diff --git a/source.local/ap/vim/patches/7.3.251.gz b/source.local/ap/vim/patches/7.3.251.gz
new file mode 100644
index 0000000..ba5543b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.251.gz
diff --git a/source.local/ap/vim/patches/7.3.252.gz b/source.local/ap/vim/patches/7.3.252.gz
new file mode 100644
index 0000000..a9928dd
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.252.gz
diff --git a/source.local/ap/vim/patches/7.3.253.gz b/source.local/ap/vim/patches/7.3.253.gz
new file mode 100644
index 0000000..000a17f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.253.gz
diff --git a/source.local/ap/vim/patches/7.3.254.gz b/source.local/ap/vim/patches/7.3.254.gz
new file mode 100644
index 0000000..af8248d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.254.gz
diff --git a/source.local/ap/vim/patches/7.3.255.gz b/source.local/ap/vim/patches/7.3.255.gz
new file mode 100644
index 0000000..a67b435
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.255.gz
diff --git a/source.local/ap/vim/patches/7.3.256.gz b/source.local/ap/vim/patches/7.3.256.gz
new file mode 100644
index 0000000..380fc9d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.256.gz
diff --git a/source.local/ap/vim/patches/7.3.257.gz b/source.local/ap/vim/patches/7.3.257.gz
new file mode 100644
index 0000000..93d7fe1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.257.gz
diff --git a/source.local/ap/vim/patches/7.3.258.gz b/source.local/ap/vim/patches/7.3.258.gz
new file mode 100644
index 0000000..b5040c4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.258.gz
diff --git a/source.local/ap/vim/patches/7.3.259.gz b/source.local/ap/vim/patches/7.3.259.gz
new file mode 100644
index 0000000..6912a02
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.259.gz
diff --git a/source.local/ap/vim/patches/7.3.260.gz b/source.local/ap/vim/patches/7.3.260.gz
new file mode 100644
index 0000000..23f5b1e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.260.gz
diff --git a/source.local/ap/vim/patches/7.3.261.gz b/source.local/ap/vim/patches/7.3.261.gz
new file mode 100644
index 0000000..5368eb8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.261.gz
diff --git a/source.local/ap/vim/patches/7.3.262.gz b/source.local/ap/vim/patches/7.3.262.gz
new file mode 100644
index 0000000..a435f3c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.262.gz
diff --git a/source.local/ap/vim/patches/7.3.263.gz b/source.local/ap/vim/patches/7.3.263.gz
new file mode 100644
index 0000000..7982081
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.263.gz
diff --git a/source.local/ap/vim/patches/7.3.264.gz b/source.local/ap/vim/patches/7.3.264.gz
new file mode 100644
index 0000000..dadde1a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.264.gz
diff --git a/source.local/ap/vim/patches/7.3.265.gz b/source.local/ap/vim/patches/7.3.265.gz
new file mode 100644
index 0000000..276bb07
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.265.gz
diff --git a/source.local/ap/vim/patches/7.3.266.gz b/source.local/ap/vim/patches/7.3.266.gz
new file mode 100644
index 0000000..23835f6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.266.gz
diff --git a/source.local/ap/vim/patches/7.3.267.gz b/source.local/ap/vim/patches/7.3.267.gz
new file mode 100644
index 0000000..8487d22
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.267.gz
diff --git a/source.local/ap/vim/patches/7.3.268.gz b/source.local/ap/vim/patches/7.3.268.gz
new file mode 100644
index 0000000..83ad028
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.268.gz
diff --git a/source.local/ap/vim/patches/7.3.269.gz b/source.local/ap/vim/patches/7.3.269.gz
new file mode 100644
index 0000000..c9a3e54
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.269.gz
diff --git a/source.local/ap/vim/patches/7.3.270.gz b/source.local/ap/vim/patches/7.3.270.gz
new file mode 100644
index 0000000..61f55b4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.270.gz
diff --git a/source.local/ap/vim/patches/7.3.271.gz b/source.local/ap/vim/patches/7.3.271.gz
new file mode 100644
index 0000000..e74bf24
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.271.gz
diff --git a/source.local/ap/vim/patches/7.3.272.gz b/source.local/ap/vim/patches/7.3.272.gz
new file mode 100644
index 0000000..cc528f4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.272.gz
diff --git a/source.local/ap/vim/patches/7.3.273.gz b/source.local/ap/vim/patches/7.3.273.gz
new file mode 100644
index 0000000..d008383
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.273.gz
diff --git a/source.local/ap/vim/patches/7.3.274.gz b/source.local/ap/vim/patches/7.3.274.gz
new file mode 100644
index 0000000..eda6921
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.274.gz
diff --git a/source.local/ap/vim/patches/7.3.275.gz b/source.local/ap/vim/patches/7.3.275.gz
new file mode 100644
index 0000000..efbe359
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.275.gz
diff --git a/source.local/ap/vim/patches/7.3.276.gz b/source.local/ap/vim/patches/7.3.276.gz
new file mode 100644
index 0000000..4b1c9e5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.276.gz
diff --git a/source.local/ap/vim/patches/7.3.277.gz b/source.local/ap/vim/patches/7.3.277.gz
new file mode 100644
index 0000000..d7dbb9a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.277.gz
diff --git a/source.local/ap/vim/patches/7.3.278.gz b/source.local/ap/vim/patches/7.3.278.gz
new file mode 100644
index 0000000..4a571c4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.278.gz
diff --git a/source.local/ap/vim/patches/7.3.279.gz b/source.local/ap/vim/patches/7.3.279.gz
new file mode 100644
index 0000000..b345c86
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.279.gz
diff --git a/source.local/ap/vim/patches/7.3.280.gz b/source.local/ap/vim/patches/7.3.280.gz
new file mode 100644
index 0000000..f76009c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.280.gz
diff --git a/source.local/ap/vim/patches/7.3.281.gz b/source.local/ap/vim/patches/7.3.281.gz
new file mode 100644
index 0000000..3051cfa
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.281.gz
diff --git a/source.local/ap/vim/patches/7.3.282.gz b/source.local/ap/vim/patches/7.3.282.gz
new file mode 100644
index 0000000..f8c69f8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.282.gz
diff --git a/source.local/ap/vim/patches/7.3.283.gz b/source.local/ap/vim/patches/7.3.283.gz
new file mode 100644
index 0000000..a2932f6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.283.gz
diff --git a/source.local/ap/vim/patches/7.3.284.gz b/source.local/ap/vim/patches/7.3.284.gz
new file mode 100644
index 0000000..48fbabc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.284.gz
diff --git a/source.local/ap/vim/patches/7.3.285.gz b/source.local/ap/vim/patches/7.3.285.gz
new file mode 100644
index 0000000..9560f5b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.285.gz
diff --git a/source.local/ap/vim/patches/7.3.286.gz b/source.local/ap/vim/patches/7.3.286.gz
new file mode 100644
index 0000000..24b1ffe
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.286.gz
diff --git a/source.local/ap/vim/patches/7.3.287.gz b/source.local/ap/vim/patches/7.3.287.gz
new file mode 100644
index 0000000..f6b955a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.287.gz
diff --git a/source.local/ap/vim/patches/7.3.288.gz b/source.local/ap/vim/patches/7.3.288.gz
new file mode 100644
index 0000000..0220ee2
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.288.gz
diff --git a/source.local/ap/vim/patches/7.3.289.gz b/source.local/ap/vim/patches/7.3.289.gz
new file mode 100644
index 0000000..b8373fc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.289.gz
diff --git a/source.local/ap/vim/patches/7.3.290.gz b/source.local/ap/vim/patches/7.3.290.gz
new file mode 100644
index 0000000..b37fd4e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.290.gz
diff --git a/source.local/ap/vim/patches/7.3.291.gz b/source.local/ap/vim/patches/7.3.291.gz
new file mode 100644
index 0000000..2b08fd5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.291.gz
diff --git a/source.local/ap/vim/patches/7.3.292.gz b/source.local/ap/vim/patches/7.3.292.gz
new file mode 100644
index 0000000..dc135e1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.292.gz
diff --git a/source.local/ap/vim/patches/7.3.293.gz b/source.local/ap/vim/patches/7.3.293.gz
new file mode 100644
index 0000000..ec76814
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.293.gz
diff --git a/source.local/ap/vim/patches/7.3.294.gz b/source.local/ap/vim/patches/7.3.294.gz
new file mode 100644
index 0000000..6949a07
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.294.gz
diff --git a/source.local/ap/vim/patches/7.3.295.gz b/source.local/ap/vim/patches/7.3.295.gz
new file mode 100644
index 0000000..445934a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.295.gz
diff --git a/source.local/ap/vim/patches/7.3.296.gz b/source.local/ap/vim/patches/7.3.296.gz
new file mode 100644
index 0000000..58dfaa7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.296.gz
diff --git a/source.local/ap/vim/patches/7.3.297.gz b/source.local/ap/vim/patches/7.3.297.gz
new file mode 100644
index 0000000..63e99e7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.297.gz
diff --git a/source.local/ap/vim/patches/7.3.298.gz b/source.local/ap/vim/patches/7.3.298.gz
new file mode 100644
index 0000000..07e3728
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.298.gz
diff --git a/source.local/ap/vim/patches/7.3.299.gz b/source.local/ap/vim/patches/7.3.299.gz
new file mode 100644
index 0000000..7808ab6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.299.gz
diff --git a/source.local/ap/vim/patches/7.3.300.gz b/source.local/ap/vim/patches/7.3.300.gz
new file mode 100644
index 0000000..2f39c54
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.300.gz
diff --git a/source.local/ap/vim/patches/7.3.301.gz b/source.local/ap/vim/patches/7.3.301.gz
new file mode 100644
index 0000000..80a1d02
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.301.gz
diff --git a/source.local/ap/vim/patches/7.3.302.gz b/source.local/ap/vim/patches/7.3.302.gz
new file mode 100644
index 0000000..e7c74d1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.302.gz
diff --git a/source.local/ap/vim/patches/7.3.303.gz b/source.local/ap/vim/patches/7.3.303.gz
new file mode 100644
index 0000000..5545a87
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.303.gz
diff --git a/source.local/ap/vim/patches/7.3.304.gz b/source.local/ap/vim/patches/7.3.304.gz
new file mode 100644
index 0000000..2064f80
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.304.gz
diff --git a/source.local/ap/vim/patches/7.3.305.gz b/source.local/ap/vim/patches/7.3.305.gz
new file mode 100644
index 0000000..ca32424
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.305.gz
diff --git a/source.local/ap/vim/patches/7.3.306.gz b/source.local/ap/vim/patches/7.3.306.gz
new file mode 100644
index 0000000..214b9a6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.306.gz
diff --git a/source.local/ap/vim/patches/7.3.307.gz b/source.local/ap/vim/patches/7.3.307.gz
new file mode 100644
index 0000000..183b75b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.307.gz
diff --git a/source.local/ap/vim/patches/7.3.308.gz b/source.local/ap/vim/patches/7.3.308.gz
new file mode 100644
index 0000000..0d19d8a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.308.gz
diff --git a/source.local/ap/vim/patches/7.3.309.gz b/source.local/ap/vim/patches/7.3.309.gz
new file mode 100644
index 0000000..6349392
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.309.gz
diff --git a/source.local/ap/vim/patches/7.3.310.gz b/source.local/ap/vim/patches/7.3.310.gz
new file mode 100644
index 0000000..1331ae9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.310.gz
diff --git a/source.local/ap/vim/patches/7.3.311.gz b/source.local/ap/vim/patches/7.3.311.gz
new file mode 100644
index 0000000..f87b6ea
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.311.gz
diff --git a/source.local/ap/vim/patches/7.3.312.gz b/source.local/ap/vim/patches/7.3.312.gz
new file mode 100644
index 0000000..987fbc1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.312.gz
diff --git a/source.local/ap/vim/patches/7.3.313.gz b/source.local/ap/vim/patches/7.3.313.gz
new file mode 100644
index 0000000..2de451d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.313.gz
diff --git a/source.local/ap/vim/patches/7.3.314.gz b/source.local/ap/vim/patches/7.3.314.gz
new file mode 100644
index 0000000..2577ce3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.314.gz
diff --git a/source.local/ap/vim/patches/7.3.315.gz b/source.local/ap/vim/patches/7.3.315.gz
new file mode 100644
index 0000000..958d03b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.315.gz
diff --git a/source.local/ap/vim/patches/7.3.316.gz b/source.local/ap/vim/patches/7.3.316.gz
new file mode 100644
index 0000000..3f508b3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.316.gz
diff --git a/source.local/ap/vim/patches/7.3.317.gz b/source.local/ap/vim/patches/7.3.317.gz
new file mode 100644
index 0000000..408d42c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.317.gz
diff --git a/source.local/ap/vim/patches/7.3.318.gz b/source.local/ap/vim/patches/7.3.318.gz
new file mode 100644
index 0000000..0a799c8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.318.gz
diff --git a/source.local/ap/vim/patches/7.3.319.gz b/source.local/ap/vim/patches/7.3.319.gz
new file mode 100644
index 0000000..0965253
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.319.gz
diff --git a/source.local/ap/vim/patches/7.3.320.gz b/source.local/ap/vim/patches/7.3.320.gz
new file mode 100644
index 0000000..3549783
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.320.gz
diff --git a/source.local/ap/vim/patches/7.3.321.gz b/source.local/ap/vim/patches/7.3.321.gz
new file mode 100644
index 0000000..84541f7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.321.gz
diff --git a/source.local/ap/vim/patches/7.3.322.gz b/source.local/ap/vim/patches/7.3.322.gz
new file mode 100644
index 0000000..851fd97
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.322.gz
diff --git a/source.local/ap/vim/patches/7.3.323.gz b/source.local/ap/vim/patches/7.3.323.gz
new file mode 100644
index 0000000..e24acaa
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.323.gz
diff --git a/source.local/ap/vim/patches/7.3.324.gz b/source.local/ap/vim/patches/7.3.324.gz
new file mode 100644
index 0000000..d320512
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.324.gz
diff --git a/source.local/ap/vim/patches/7.3.325.gz b/source.local/ap/vim/patches/7.3.325.gz
new file mode 100644
index 0000000..054daeb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.325.gz
diff --git a/source.local/ap/vim/patches/7.3.326.gz b/source.local/ap/vim/patches/7.3.326.gz
new file mode 100644
index 0000000..fab66a3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.326.gz
diff --git a/source.local/ap/vim/patches/7.3.327.gz b/source.local/ap/vim/patches/7.3.327.gz
new file mode 100644
index 0000000..c46f543
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.327.gz
diff --git a/source.local/ap/vim/patches/7.3.328.gz b/source.local/ap/vim/patches/7.3.328.gz
new file mode 100644
index 0000000..d8fd323
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.328.gz
diff --git a/source.local/ap/vim/patches/7.3.329.gz b/source.local/ap/vim/patches/7.3.329.gz
new file mode 100644
index 0000000..eeae7b4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.329.gz
diff --git a/source.local/ap/vim/patches/7.3.330.gz b/source.local/ap/vim/patches/7.3.330.gz
new file mode 100644
index 0000000..48ec016
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.330.gz
diff --git a/source.local/ap/vim/patches/7.3.331.gz b/source.local/ap/vim/patches/7.3.331.gz
new file mode 100644
index 0000000..18e34d3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.331.gz
diff --git a/source.local/ap/vim/patches/7.3.332.gz b/source.local/ap/vim/patches/7.3.332.gz
new file mode 100644
index 0000000..4718ef9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.332.gz
diff --git a/source.local/ap/vim/patches/7.3.333.gz b/source.local/ap/vim/patches/7.3.333.gz
new file mode 100644
index 0000000..0aa8415
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.333.gz
diff --git a/source.local/ap/vim/patches/7.3.334.gz b/source.local/ap/vim/patches/7.3.334.gz
new file mode 100644
index 0000000..ae7880e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.334.gz
diff --git a/source.local/ap/vim/patches/7.3.335.gz b/source.local/ap/vim/patches/7.3.335.gz
new file mode 100644
index 0000000..f70e934
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.335.gz
diff --git a/source.local/ap/vim/patches/7.3.336.gz b/source.local/ap/vim/patches/7.3.336.gz
new file mode 100644
index 0000000..5c31636
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.336.gz
diff --git a/source.local/ap/vim/patches/7.3.337.gz b/source.local/ap/vim/patches/7.3.337.gz
new file mode 100644
index 0000000..4caad5b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.337.gz
diff --git a/source.local/ap/vim/patches/7.3.338.gz b/source.local/ap/vim/patches/7.3.338.gz
new file mode 100644
index 0000000..a24864a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.338.gz
diff --git a/source.local/ap/vim/patches/7.3.339.gz b/source.local/ap/vim/patches/7.3.339.gz
new file mode 100644
index 0000000..ded0bc3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.339.gz
diff --git a/source.local/ap/vim/patches/7.3.340.gz b/source.local/ap/vim/patches/7.3.340.gz
new file mode 100644
index 0000000..120b3d9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.340.gz
diff --git a/source.local/ap/vim/patches/7.3.341.gz b/source.local/ap/vim/patches/7.3.341.gz
new file mode 100644
index 0000000..7c1b0d2
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.341.gz
diff --git a/source.local/ap/vim/patches/7.3.342.gz b/source.local/ap/vim/patches/7.3.342.gz
new file mode 100644
index 0000000..7885e22
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.342.gz
diff --git a/source.local/ap/vim/patches/7.3.343.gz b/source.local/ap/vim/patches/7.3.343.gz
new file mode 100644
index 0000000..16aff26
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.343.gz
diff --git a/source.local/ap/vim/patches/7.3.344.gz b/source.local/ap/vim/patches/7.3.344.gz
new file mode 100644
index 0000000..44ba88d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.344.gz
diff --git a/source.local/ap/vim/patches/7.3.345.gz b/source.local/ap/vim/patches/7.3.345.gz
new file mode 100644
index 0000000..8a2ab6f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.345.gz
diff --git a/source.local/ap/vim/patches/7.3.346.gz b/source.local/ap/vim/patches/7.3.346.gz
new file mode 100644
index 0000000..4b451ed
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.346.gz
diff --git a/source.local/ap/vim/patches/7.3.347.gz b/source.local/ap/vim/patches/7.3.347.gz
new file mode 100644
index 0000000..b70712a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.347.gz
diff --git a/source.local/ap/vim/patches/7.3.348.gz b/source.local/ap/vim/patches/7.3.348.gz
new file mode 100644
index 0000000..7437c13
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.348.gz
diff --git a/source.local/ap/vim/patches/7.3.349.gz b/source.local/ap/vim/patches/7.3.349.gz
new file mode 100644
index 0000000..e35f27d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.349.gz
diff --git a/source.local/ap/vim/patches/7.3.350.gz b/source.local/ap/vim/patches/7.3.350.gz
new file mode 100644
index 0000000..3aab050
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.350.gz
diff --git a/source.local/ap/vim/patches/7.3.351.gz b/source.local/ap/vim/patches/7.3.351.gz
new file mode 100644
index 0000000..7c568d7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.351.gz
diff --git a/source.local/ap/vim/patches/7.3.352.gz b/source.local/ap/vim/patches/7.3.352.gz
new file mode 100644
index 0000000..46f7985
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.352.gz
diff --git a/source.local/ap/vim/patches/7.3.353.gz b/source.local/ap/vim/patches/7.3.353.gz
new file mode 100644
index 0000000..cf4328b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.353.gz
diff --git a/source.local/ap/vim/patches/7.3.354.gz b/source.local/ap/vim/patches/7.3.354.gz
new file mode 100644
index 0000000..34ad289
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.354.gz
diff --git a/source.local/ap/vim/patches/7.3.355.gz b/source.local/ap/vim/patches/7.3.355.gz
new file mode 100644
index 0000000..d5e1fba
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.355.gz
diff --git a/source.local/ap/vim/patches/7.3.356.gz b/source.local/ap/vim/patches/7.3.356.gz
new file mode 100644
index 0000000..4e59e44
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.356.gz
diff --git a/source.local/ap/vim/patches/7.3.357.gz b/source.local/ap/vim/patches/7.3.357.gz
new file mode 100644
index 0000000..f55956a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.357.gz
diff --git a/source.local/ap/vim/patches/7.3.358.gz b/source.local/ap/vim/patches/7.3.358.gz
new file mode 100644
index 0000000..338ddc9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.358.gz
diff --git a/source.local/ap/vim/patches/7.3.359.gz b/source.local/ap/vim/patches/7.3.359.gz
new file mode 100644
index 0000000..c391e2f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.359.gz
diff --git a/source.local/ap/vim/patches/7.3.360.gz b/source.local/ap/vim/patches/7.3.360.gz
new file mode 100644
index 0000000..14a34d7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.360.gz
diff --git a/source.local/ap/vim/patches/7.3.361.gz b/source.local/ap/vim/patches/7.3.361.gz
new file mode 100644
index 0000000..33e0ad2
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.361.gz
diff --git a/source.local/ap/vim/patches/7.3.362.gz b/source.local/ap/vim/patches/7.3.362.gz
new file mode 100644
index 0000000..37a8b60
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.362.gz
diff --git a/source.local/ap/vim/patches/7.3.363.gz b/source.local/ap/vim/patches/7.3.363.gz
new file mode 100644
index 0000000..c23bd0c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.363.gz
diff --git a/source.local/ap/vim/patches/7.3.364.gz b/source.local/ap/vim/patches/7.3.364.gz
new file mode 100644
index 0000000..5838029
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.364.gz
diff --git a/source.local/ap/vim/patches/7.3.365.gz b/source.local/ap/vim/patches/7.3.365.gz
new file mode 100644
index 0000000..f705562
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.365.gz
diff --git a/source.local/ap/vim/patches/7.3.366.gz b/source.local/ap/vim/patches/7.3.366.gz
new file mode 100644
index 0000000..cd7a3c1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.366.gz
diff --git a/source.local/ap/vim/patches/7.3.367.gz b/source.local/ap/vim/patches/7.3.367.gz
new file mode 100644
index 0000000..49a90ed
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.367.gz
diff --git a/source.local/ap/vim/patches/7.3.368.gz b/source.local/ap/vim/patches/7.3.368.gz
new file mode 100644
index 0000000..4223378
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.368.gz
diff --git a/source.local/ap/vim/patches/7.3.369.gz b/source.local/ap/vim/patches/7.3.369.gz
new file mode 100644
index 0000000..529b47e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.369.gz
diff --git a/source.local/ap/vim/patches/7.3.370.gz b/source.local/ap/vim/patches/7.3.370.gz
new file mode 100644
index 0000000..6bdd9d7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.370.gz
diff --git a/source.local/ap/vim/patches/7.3.371.gz b/source.local/ap/vim/patches/7.3.371.gz
new file mode 100644
index 0000000..04c5f1b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.371.gz
diff --git a/source.local/ap/vim/patches/7.3.372.gz b/source.local/ap/vim/patches/7.3.372.gz
new file mode 100644
index 0000000..3557482
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.372.gz
diff --git a/source.local/ap/vim/patches/7.3.373.gz b/source.local/ap/vim/patches/7.3.373.gz
new file mode 100644
index 0000000..5f36a84
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.373.gz
diff --git a/source.local/ap/vim/patches/7.3.374.gz b/source.local/ap/vim/patches/7.3.374.gz
new file mode 100644
index 0000000..509a732
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.374.gz
diff --git a/source.local/ap/vim/patches/7.3.375.gz b/source.local/ap/vim/patches/7.3.375.gz
new file mode 100644
index 0000000..b37e4d9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.375.gz
diff --git a/source.local/ap/vim/patches/7.3.376.gz b/source.local/ap/vim/patches/7.3.376.gz
new file mode 100644
index 0000000..fcb4c79
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.376.gz
diff --git a/source.local/ap/vim/patches/7.3.377.gz b/source.local/ap/vim/patches/7.3.377.gz
new file mode 100644
index 0000000..d8d9f61
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.377.gz
diff --git a/source.local/ap/vim/patches/7.3.378.gz b/source.local/ap/vim/patches/7.3.378.gz
new file mode 100644
index 0000000..3c64b31
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.378.gz
diff --git a/source.local/ap/vim/patches/7.3.379.gz b/source.local/ap/vim/patches/7.3.379.gz
new file mode 100644
index 0000000..bac608c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.379.gz
diff --git a/source.local/ap/vim/patches/7.3.380.gz b/source.local/ap/vim/patches/7.3.380.gz
new file mode 100644
index 0000000..09b61d7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.380.gz
diff --git a/source.local/ap/vim/patches/7.3.381.gz b/source.local/ap/vim/patches/7.3.381.gz
new file mode 100644
index 0000000..874f444
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.381.gz
diff --git a/source.local/ap/vim/patches/7.3.382.gz b/source.local/ap/vim/patches/7.3.382.gz
new file mode 100644
index 0000000..06d5913
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.382.gz
diff --git a/source.local/ap/vim/patches/7.3.383.gz b/source.local/ap/vim/patches/7.3.383.gz
new file mode 100644
index 0000000..049ffb9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.383.gz
diff --git a/source.local/ap/vim/patches/7.3.384.gz b/source.local/ap/vim/patches/7.3.384.gz
new file mode 100644
index 0000000..dedba19
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.384.gz
diff --git a/source.local/ap/vim/patches/7.3.385.gz b/source.local/ap/vim/patches/7.3.385.gz
new file mode 100644
index 0000000..00754c1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.385.gz
diff --git a/source.local/ap/vim/patches/7.3.386.gz b/source.local/ap/vim/patches/7.3.386.gz
new file mode 100644
index 0000000..39c3e1a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.386.gz
diff --git a/source.local/ap/vim/patches/7.3.387.gz b/source.local/ap/vim/patches/7.3.387.gz
new file mode 100644
index 0000000..3473423
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.387.gz
diff --git a/source.local/ap/vim/patches/7.3.388.gz b/source.local/ap/vim/patches/7.3.388.gz
new file mode 100644
index 0000000..4a69b52
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.388.gz
diff --git a/source.local/ap/vim/patches/7.3.389.gz b/source.local/ap/vim/patches/7.3.389.gz
new file mode 100644
index 0000000..3729cc3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.389.gz
diff --git a/source.local/ap/vim/patches/7.3.390.gz b/source.local/ap/vim/patches/7.3.390.gz
new file mode 100644
index 0000000..521d447
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.390.gz
diff --git a/source.local/ap/vim/patches/7.3.391.gz b/source.local/ap/vim/patches/7.3.391.gz
new file mode 100644
index 0000000..a4d15e2
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.391.gz
diff --git a/source.local/ap/vim/patches/7.3.392.gz b/source.local/ap/vim/patches/7.3.392.gz
new file mode 100644
index 0000000..6363370
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.392.gz
diff --git a/source.local/ap/vim/patches/7.3.393.gz b/source.local/ap/vim/patches/7.3.393.gz
new file mode 100644
index 0000000..719afd6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.393.gz
diff --git a/source.local/ap/vim/patches/7.3.394.gz b/source.local/ap/vim/patches/7.3.394.gz
new file mode 100644
index 0000000..0c0233d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.394.gz
diff --git a/source.local/ap/vim/patches/7.3.395.gz b/source.local/ap/vim/patches/7.3.395.gz
new file mode 100644
index 0000000..07479b0
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.395.gz
diff --git a/source.local/ap/vim/patches/7.3.396.gz b/source.local/ap/vim/patches/7.3.396.gz
new file mode 100644
index 0000000..356146f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.396.gz
diff --git a/source.local/ap/vim/patches/7.3.397.gz b/source.local/ap/vim/patches/7.3.397.gz
new file mode 100644
index 0000000..5bc3196
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.397.gz
diff --git a/source.local/ap/vim/patches/7.3.398.gz b/source.local/ap/vim/patches/7.3.398.gz
new file mode 100644
index 0000000..9ae26bc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.398.gz
diff --git a/source.local/ap/vim/patches/7.3.399.gz b/source.local/ap/vim/patches/7.3.399.gz
new file mode 100644
index 0000000..676ccc1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.399.gz
diff --git a/source.local/ap/vim/patches/7.3.400.gz b/source.local/ap/vim/patches/7.3.400.gz
new file mode 100644
index 0000000..cb18c13
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.400.gz
diff --git a/source.local/ap/vim/patches/7.3.401.gz b/source.local/ap/vim/patches/7.3.401.gz
new file mode 100644
index 0000000..fd36282
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.401.gz
diff --git a/source.local/ap/vim/patches/7.3.402.gz b/source.local/ap/vim/patches/7.3.402.gz
new file mode 100644
index 0000000..7eaf3bc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.402.gz
diff --git a/source.local/ap/vim/patches/7.3.403.gz b/source.local/ap/vim/patches/7.3.403.gz
new file mode 100644
index 0000000..99e4377
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.403.gz
diff --git a/source.local/ap/vim/patches/7.3.404.gz b/source.local/ap/vim/patches/7.3.404.gz
new file mode 100644
index 0000000..834ba02
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.404.gz
diff --git a/source.local/ap/vim/patches/7.3.405.gz b/source.local/ap/vim/patches/7.3.405.gz
new file mode 100644
index 0000000..661d991
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.405.gz
diff --git a/source.local/ap/vim/patches/7.3.406.gz b/source.local/ap/vim/patches/7.3.406.gz
new file mode 100644
index 0000000..d27ca40
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.406.gz
diff --git a/source.local/ap/vim/patches/7.3.407.gz b/source.local/ap/vim/patches/7.3.407.gz
new file mode 100644
index 0000000..8cb2045
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.407.gz
diff --git a/source.local/ap/vim/patches/7.3.408.gz b/source.local/ap/vim/patches/7.3.408.gz
new file mode 100644
index 0000000..1741017
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.408.gz
diff --git a/source.local/ap/vim/patches/7.3.409.gz b/source.local/ap/vim/patches/7.3.409.gz
new file mode 100644
index 0000000..7d721ab
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.409.gz
diff --git a/source.local/ap/vim/patches/7.3.410.gz b/source.local/ap/vim/patches/7.3.410.gz
new file mode 100644
index 0000000..96fb574
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.410.gz
diff --git a/source.local/ap/vim/patches/7.3.411.gz b/source.local/ap/vim/patches/7.3.411.gz
new file mode 100644
index 0000000..b1c1196
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.411.gz
diff --git a/source.local/ap/vim/patches/7.3.412.gz b/source.local/ap/vim/patches/7.3.412.gz
new file mode 100644
index 0000000..07ac19d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.412.gz
diff --git a/source.local/ap/vim/patches/7.3.413.gz b/source.local/ap/vim/patches/7.3.413.gz
new file mode 100644
index 0000000..0da4a4b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.413.gz
diff --git a/source.local/ap/vim/patches/7.3.414.gz b/source.local/ap/vim/patches/7.3.414.gz
new file mode 100644
index 0000000..8a5195d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.414.gz
diff --git a/source.local/ap/vim/patches/7.3.415.gz b/source.local/ap/vim/patches/7.3.415.gz
new file mode 100644
index 0000000..9961035
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.415.gz
diff --git a/source.local/ap/vim/patches/7.3.416.gz b/source.local/ap/vim/patches/7.3.416.gz
new file mode 100644
index 0000000..c5ca904
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.416.gz
diff --git a/source.local/ap/vim/patches/7.3.417.gz b/source.local/ap/vim/patches/7.3.417.gz
new file mode 100644
index 0000000..13a2610
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.417.gz
diff --git a/source.local/ap/vim/patches/7.3.418.gz b/source.local/ap/vim/patches/7.3.418.gz
new file mode 100644
index 0000000..c1ab22c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.418.gz
diff --git a/source.local/ap/vim/patches/7.3.419.gz b/source.local/ap/vim/patches/7.3.419.gz
new file mode 100644
index 0000000..d80e8c7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.419.gz
diff --git a/source.local/ap/vim/patches/7.3.420.gz b/source.local/ap/vim/patches/7.3.420.gz
new file mode 100644
index 0000000..4e5299f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.420.gz
diff --git a/source.local/ap/vim/patches/7.3.421.gz b/source.local/ap/vim/patches/7.3.421.gz
new file mode 100644
index 0000000..d8b898d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.421.gz
diff --git a/source.local/ap/vim/patches/7.3.422.gz b/source.local/ap/vim/patches/7.3.422.gz
new file mode 100644
index 0000000..1f04b24
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.422.gz
diff --git a/source.local/ap/vim/patches/7.3.423.gz b/source.local/ap/vim/patches/7.3.423.gz
new file mode 100644
index 0000000..f3dd5ee
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.423.gz
diff --git a/source.local/ap/vim/patches/7.3.424.gz b/source.local/ap/vim/patches/7.3.424.gz
new file mode 100644
index 0000000..f87c389
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.424.gz
diff --git a/source.local/ap/vim/patches/7.3.425.gz b/source.local/ap/vim/patches/7.3.425.gz
new file mode 100644
index 0000000..e8e5039
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.425.gz
diff --git a/source.local/ap/vim/patches/7.3.426.gz b/source.local/ap/vim/patches/7.3.426.gz
new file mode 100644
index 0000000..1a94ff6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.426.gz
diff --git a/source.local/ap/vim/patches/7.3.427.gz b/source.local/ap/vim/patches/7.3.427.gz
new file mode 100644
index 0000000..83eca08
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.427.gz
diff --git a/source.local/ap/vim/patches/7.3.428.gz b/source.local/ap/vim/patches/7.3.428.gz
new file mode 100644
index 0000000..4c6aa7d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.428.gz
diff --git a/source.local/ap/vim/patches/7.3.429.gz b/source.local/ap/vim/patches/7.3.429.gz
new file mode 100644
index 0000000..7a15acb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.429.gz
diff --git a/source.local/ap/vim/patches/7.3.430.gz b/source.local/ap/vim/patches/7.3.430.gz
new file mode 100644
index 0000000..03fb896
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.430.gz
diff --git a/source.local/ap/vim/patches/7.3.431.gz b/source.local/ap/vim/patches/7.3.431.gz
new file mode 100644
index 0000000..67b1eba
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.431.gz
diff --git a/source.local/ap/vim/patches/7.3.432.gz b/source.local/ap/vim/patches/7.3.432.gz
new file mode 100644
index 0000000..7f437ca
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.432.gz
diff --git a/source.local/ap/vim/patches/7.3.433.gz b/source.local/ap/vim/patches/7.3.433.gz
new file mode 100644
index 0000000..90d6940
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.433.gz
diff --git a/source.local/ap/vim/patches/7.3.434.gz b/source.local/ap/vim/patches/7.3.434.gz
new file mode 100644
index 0000000..fa8ecfb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.434.gz
diff --git a/source.local/ap/vim/patches/7.3.435.gz b/source.local/ap/vim/patches/7.3.435.gz
new file mode 100644
index 0000000..9405568
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.435.gz
diff --git a/source.local/ap/vim/patches/7.3.436.gz b/source.local/ap/vim/patches/7.3.436.gz
new file mode 100644
index 0000000..94782cb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.436.gz
diff --git a/source.local/ap/vim/patches/7.3.437.gz b/source.local/ap/vim/patches/7.3.437.gz
new file mode 100644
index 0000000..037973b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.437.gz
diff --git a/source.local/ap/vim/patches/7.3.438.gz b/source.local/ap/vim/patches/7.3.438.gz
new file mode 100644
index 0000000..3c5a754
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.438.gz
diff --git a/source.local/ap/vim/patches/7.3.439.gz b/source.local/ap/vim/patches/7.3.439.gz
new file mode 100644
index 0000000..03529e6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.439.gz
diff --git a/source.local/ap/vim/patches/7.3.440.gz b/source.local/ap/vim/patches/7.3.440.gz
new file mode 100644
index 0000000..4044c2b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.440.gz
diff --git a/source.local/ap/vim/patches/7.3.441.gz b/source.local/ap/vim/patches/7.3.441.gz
new file mode 100644
index 0000000..3fe7c99
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.441.gz
diff --git a/source.local/ap/vim/patches/7.3.442.gz b/source.local/ap/vim/patches/7.3.442.gz
new file mode 100644
index 0000000..44452a4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.442.gz
diff --git a/source.local/ap/vim/patches/7.3.443.gz b/source.local/ap/vim/patches/7.3.443.gz
new file mode 100644
index 0000000..5c68986
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.443.gz
diff --git a/source.local/ap/vim/patches/7.3.444.gz b/source.local/ap/vim/patches/7.3.444.gz
new file mode 100644
index 0000000..8191174
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.444.gz
diff --git a/source.local/ap/vim/patches/7.3.445.gz b/source.local/ap/vim/patches/7.3.445.gz
new file mode 100644
index 0000000..4952d35
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.445.gz
diff --git a/source.local/ap/vim/patches/7.3.446.gz b/source.local/ap/vim/patches/7.3.446.gz
new file mode 100644
index 0000000..4669992
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.446.gz
diff --git a/source.local/ap/vim/patches/7.3.447.gz b/source.local/ap/vim/patches/7.3.447.gz
new file mode 100644
index 0000000..3c2af3a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.447.gz
diff --git a/source.local/ap/vim/patches/7.3.448.gz b/source.local/ap/vim/patches/7.3.448.gz
new file mode 100644
index 0000000..73bcb27
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.448.gz
diff --git a/source.local/ap/vim/patches/7.3.449.gz b/source.local/ap/vim/patches/7.3.449.gz
new file mode 100644
index 0000000..3454e1e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.449.gz
diff --git a/source.local/ap/vim/patches/7.3.450.gz b/source.local/ap/vim/patches/7.3.450.gz
new file mode 100644
index 0000000..178544e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.450.gz
diff --git a/source.local/ap/vim/patches/7.3.451.gz b/source.local/ap/vim/patches/7.3.451.gz
new file mode 100644
index 0000000..5172b65
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.451.gz
diff --git a/source.local/ap/vim/patches/7.3.452.gz b/source.local/ap/vim/patches/7.3.452.gz
new file mode 100644
index 0000000..1b59f0c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.452.gz
diff --git a/source.local/ap/vim/patches/7.3.453.gz b/source.local/ap/vim/patches/7.3.453.gz
new file mode 100644
index 0000000..6597f31
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.453.gz
diff --git a/source.local/ap/vim/patches/7.3.454.gz b/source.local/ap/vim/patches/7.3.454.gz
new file mode 100644
index 0000000..d0615c6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.454.gz
diff --git a/source.local/ap/vim/patches/7.3.455.gz b/source.local/ap/vim/patches/7.3.455.gz
new file mode 100644
index 0000000..d295b06
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.455.gz
diff --git a/source.local/ap/vim/patches/7.3.456.gz b/source.local/ap/vim/patches/7.3.456.gz
new file mode 100644
index 0000000..ef99a5d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.456.gz
diff --git a/source.local/ap/vim/patches/7.3.457.gz b/source.local/ap/vim/patches/7.3.457.gz
new file mode 100644
index 0000000..219ad31
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.457.gz
diff --git a/source.local/ap/vim/patches/7.3.458.gz b/source.local/ap/vim/patches/7.3.458.gz
new file mode 100644
index 0000000..e11bd37
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.458.gz
diff --git a/source.local/ap/vim/patches/7.3.459.gz b/source.local/ap/vim/patches/7.3.459.gz
new file mode 100644
index 0000000..883175f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.459.gz
diff --git a/source.local/ap/vim/patches/7.3.460.gz b/source.local/ap/vim/patches/7.3.460.gz
new file mode 100644
index 0000000..00ef087
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.460.gz
diff --git a/source.local/ap/vim/patches/7.3.461.gz b/source.local/ap/vim/patches/7.3.461.gz
new file mode 100644
index 0000000..8cae5b5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.461.gz
diff --git a/source.local/ap/vim/patches/7.3.462.gz b/source.local/ap/vim/patches/7.3.462.gz
new file mode 100644
index 0000000..f59b253
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.462.gz
diff --git a/source.local/ap/vim/patches/7.3.463.gz b/source.local/ap/vim/patches/7.3.463.gz
new file mode 100644
index 0000000..a2bb1aa
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.463.gz
diff --git a/source.local/ap/vim/patches/7.3.464.gz b/source.local/ap/vim/patches/7.3.464.gz
new file mode 100644
index 0000000..8a2e0a6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.464.gz
diff --git a/source.local/ap/vim/patches/7.3.465.gz b/source.local/ap/vim/patches/7.3.465.gz
new file mode 100644
index 0000000..ef09989
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.465.gz
diff --git a/source.local/ap/vim/patches/7.3.466.gz b/source.local/ap/vim/patches/7.3.466.gz
new file mode 100644
index 0000000..0b5fab3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.466.gz
diff --git a/source.local/ap/vim/patches/7.3.467.gz b/source.local/ap/vim/patches/7.3.467.gz
new file mode 100644
index 0000000..44b29b8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.467.gz
diff --git a/source.local/ap/vim/patches/7.3.468.gz b/source.local/ap/vim/patches/7.3.468.gz
new file mode 100644
index 0000000..5f61e61
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.468.gz
diff --git a/source.local/ap/vim/patches/7.3.469.gz b/source.local/ap/vim/patches/7.3.469.gz
new file mode 100644
index 0000000..8b41169
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.469.gz
diff --git a/source.local/ap/vim/patches/7.3.470.gz b/source.local/ap/vim/patches/7.3.470.gz
new file mode 100644
index 0000000..bd7d811
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.470.gz
diff --git a/source.local/ap/vim/patches/7.3.471.gz b/source.local/ap/vim/patches/7.3.471.gz
new file mode 100644
index 0000000..3bf3e8b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.471.gz
diff --git a/source.local/ap/vim/patches/7.3.472.gz b/source.local/ap/vim/patches/7.3.472.gz
new file mode 100644
index 0000000..143feb1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.472.gz
diff --git a/source.local/ap/vim/patches/7.3.473.gz b/source.local/ap/vim/patches/7.3.473.gz
new file mode 100644
index 0000000..f661e02
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.473.gz
diff --git a/source.local/ap/vim/patches/7.3.474.gz b/source.local/ap/vim/patches/7.3.474.gz
new file mode 100644
index 0000000..84b232d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.474.gz
diff --git a/source.local/ap/vim/patches/7.3.475.gz b/source.local/ap/vim/patches/7.3.475.gz
new file mode 100644
index 0000000..05b0284
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.475.gz
diff --git a/source.local/ap/vim/patches/7.3.476.gz b/source.local/ap/vim/patches/7.3.476.gz
new file mode 100644
index 0000000..cd3e2f1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.476.gz
diff --git a/source.local/ap/vim/patches/7.3.477.gz b/source.local/ap/vim/patches/7.3.477.gz
new file mode 100644
index 0000000..bac4686
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.477.gz
diff --git a/source.local/ap/vim/patches/7.3.478.gz b/source.local/ap/vim/patches/7.3.478.gz
new file mode 100644
index 0000000..29fcd78
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.478.gz
diff --git a/source.local/ap/vim/patches/7.3.479.gz b/source.local/ap/vim/patches/7.3.479.gz
new file mode 100644
index 0000000..9f80888
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.479.gz
diff --git a/source.local/ap/vim/patches/7.3.480.gz b/source.local/ap/vim/patches/7.3.480.gz
new file mode 100644
index 0000000..f453a9e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.480.gz
diff --git a/source.local/ap/vim/patches/7.3.481.gz b/source.local/ap/vim/patches/7.3.481.gz
new file mode 100644
index 0000000..3b42c48
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.481.gz
diff --git a/source.local/ap/vim/patches/7.3.482.gz b/source.local/ap/vim/patches/7.3.482.gz
new file mode 100644
index 0000000..f1c38f3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.482.gz
diff --git a/source.local/ap/vim/patches/7.3.483.gz b/source.local/ap/vim/patches/7.3.483.gz
new file mode 100644
index 0000000..c3af121
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.483.gz
diff --git a/source.local/ap/vim/patches/7.3.484.gz b/source.local/ap/vim/patches/7.3.484.gz
new file mode 100644
index 0000000..d389640
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.484.gz
diff --git a/source.local/ap/vim/patches/7.3.485.gz b/source.local/ap/vim/patches/7.3.485.gz
new file mode 100644
index 0000000..1620fa1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.485.gz
diff --git a/source.local/ap/vim/patches/7.3.486.gz b/source.local/ap/vim/patches/7.3.486.gz
new file mode 100644
index 0000000..4526a47
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.486.gz
diff --git a/source.local/ap/vim/patches/7.3.487.gz b/source.local/ap/vim/patches/7.3.487.gz
new file mode 100644
index 0000000..50184c4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.487.gz
diff --git a/source.local/ap/vim/patches/7.3.488.gz b/source.local/ap/vim/patches/7.3.488.gz
new file mode 100644
index 0000000..0f7d059
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.488.gz
diff --git a/source.local/ap/vim/patches/7.3.489.gz b/source.local/ap/vim/patches/7.3.489.gz
new file mode 100644
index 0000000..55cf48c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.489.gz
diff --git a/source.local/ap/vim/patches/7.3.490.gz b/source.local/ap/vim/patches/7.3.490.gz
new file mode 100644
index 0000000..8bfe8ce
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.490.gz
diff --git a/source.local/ap/vim/patches/7.3.491.gz b/source.local/ap/vim/patches/7.3.491.gz
new file mode 100644
index 0000000..3fef4cb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.491.gz
diff --git a/source.local/ap/vim/patches/7.3.492.gz b/source.local/ap/vim/patches/7.3.492.gz
new file mode 100644
index 0000000..af2c6ff
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.492.gz
diff --git a/source.local/ap/vim/patches/7.3.493.gz b/source.local/ap/vim/patches/7.3.493.gz
new file mode 100644
index 0000000..8070b1c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.493.gz
diff --git a/source.local/ap/vim/patches/7.3.494.gz b/source.local/ap/vim/patches/7.3.494.gz
new file mode 100644
index 0000000..7fdeebe
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.494.gz
diff --git a/source.local/ap/vim/patches/7.3.495.gz b/source.local/ap/vim/patches/7.3.495.gz
new file mode 100644
index 0000000..f8a662d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.495.gz
diff --git a/source.local/ap/vim/patches/7.3.496.gz b/source.local/ap/vim/patches/7.3.496.gz
new file mode 100644
index 0000000..6b3bf57
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.496.gz
diff --git a/source.local/ap/vim/patches/7.3.497.gz b/source.local/ap/vim/patches/7.3.497.gz
new file mode 100644
index 0000000..ed5d8c4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.497.gz
diff --git a/source.local/ap/vim/patches/7.3.498.gz b/source.local/ap/vim/patches/7.3.498.gz
new file mode 100644
index 0000000..9a7c0e5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.498.gz
diff --git a/source.local/ap/vim/patches/7.3.499.gz b/source.local/ap/vim/patches/7.3.499.gz
new file mode 100644
index 0000000..d2867dc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.499.gz
diff --git a/source.local/ap/vim/patches/7.3.500.gz b/source.local/ap/vim/patches/7.3.500.gz
new file mode 100644
index 0000000..d9d92cb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.500.gz
diff --git a/source.local/ap/vim/patches/7.3.501.gz b/source.local/ap/vim/patches/7.3.501.gz
new file mode 100644
index 0000000..f2fd43d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.501.gz
diff --git a/source.local/ap/vim/patches/7.3.502.gz b/source.local/ap/vim/patches/7.3.502.gz
new file mode 100644
index 0000000..c9e306f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.502.gz
diff --git a/source.local/ap/vim/patches/7.3.503.gz b/source.local/ap/vim/patches/7.3.503.gz
new file mode 100644
index 0000000..8b39cd1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.503.gz
diff --git a/source.local/ap/vim/patches/7.3.504.gz b/source.local/ap/vim/patches/7.3.504.gz
new file mode 100644
index 0000000..45b72ef
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.504.gz
diff --git a/source.local/ap/vim/patches/7.3.505.gz b/source.local/ap/vim/patches/7.3.505.gz
new file mode 100644
index 0000000..723e56e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.505.gz
diff --git a/source.local/ap/vim/patches/7.3.506.gz b/source.local/ap/vim/patches/7.3.506.gz
new file mode 100644
index 0000000..4e2404b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.506.gz
diff --git a/source.local/ap/vim/patches/7.3.507.gz b/source.local/ap/vim/patches/7.3.507.gz
new file mode 100644
index 0000000..1fa5063
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.507.gz
diff --git a/source.local/ap/vim/patches/7.3.508.gz b/source.local/ap/vim/patches/7.3.508.gz
new file mode 100644
index 0000000..f5684ea
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.508.gz
diff --git a/source.local/ap/vim/patches/7.3.509.gz b/source.local/ap/vim/patches/7.3.509.gz
new file mode 100644
index 0000000..ba04337
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.509.gz
diff --git a/source.local/ap/vim/patches/7.3.510.gz b/source.local/ap/vim/patches/7.3.510.gz
new file mode 100644
index 0000000..2783d6f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.510.gz
diff --git a/source.local/ap/vim/patches/7.3.511.gz b/source.local/ap/vim/patches/7.3.511.gz
new file mode 100644
index 0000000..9a8603f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.511.gz
diff --git a/source.local/ap/vim/patches/7.3.512.gz b/source.local/ap/vim/patches/7.3.512.gz
new file mode 100644
index 0000000..6e93cdf
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.512.gz
diff --git a/source.local/ap/vim/patches/7.3.513.gz b/source.local/ap/vim/patches/7.3.513.gz
new file mode 100644
index 0000000..91d8964
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.513.gz
diff --git a/source.local/ap/vim/patches/7.3.514.gz b/source.local/ap/vim/patches/7.3.514.gz
new file mode 100644
index 0000000..d03cf73
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.514.gz
diff --git a/source.local/ap/vim/patches/7.3.515.gz b/source.local/ap/vim/patches/7.3.515.gz
new file mode 100644
index 0000000..d088967
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.515.gz
diff --git a/source.local/ap/vim/patches/7.3.516.gz b/source.local/ap/vim/patches/7.3.516.gz
new file mode 100644
index 0000000..ff7d691
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.516.gz
diff --git a/source.local/ap/vim/patches/7.3.517.gz b/source.local/ap/vim/patches/7.3.517.gz
new file mode 100644
index 0000000..0f1d07e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.517.gz
diff --git a/source.local/ap/vim/patches/7.3.518.gz b/source.local/ap/vim/patches/7.3.518.gz
new file mode 100644
index 0000000..2464b0b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.518.gz
diff --git a/source.local/ap/vim/patches/7.3.519.gz b/source.local/ap/vim/patches/7.3.519.gz
new file mode 100644
index 0000000..724cc1c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.519.gz
diff --git a/source.local/ap/vim/patches/7.3.520.gz b/source.local/ap/vim/patches/7.3.520.gz
new file mode 100644
index 0000000..6904a7d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.520.gz
diff --git a/source.local/ap/vim/patches/7.3.521.gz b/source.local/ap/vim/patches/7.3.521.gz
new file mode 100644
index 0000000..2b525b1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.521.gz
diff --git a/source.local/ap/vim/patches/7.3.522.gz b/source.local/ap/vim/patches/7.3.522.gz
new file mode 100644
index 0000000..06b1383
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.522.gz
diff --git a/source.local/ap/vim/patches/7.3.523.gz b/source.local/ap/vim/patches/7.3.523.gz
new file mode 100644
index 0000000..377eece
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.523.gz
diff --git a/source.local/ap/vim/patches/7.3.524.gz b/source.local/ap/vim/patches/7.3.524.gz
new file mode 100644
index 0000000..d9ebc06
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.524.gz
diff --git a/source.local/ap/vim/patches/7.3.525.gz b/source.local/ap/vim/patches/7.3.525.gz
new file mode 100644
index 0000000..33ec5fe
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.525.gz
diff --git a/source.local/ap/vim/patches/7.3.526.gz b/source.local/ap/vim/patches/7.3.526.gz
new file mode 100644
index 0000000..ffe5a52
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.526.gz
diff --git a/source.local/ap/vim/patches/7.3.527.gz b/source.local/ap/vim/patches/7.3.527.gz
new file mode 100644
index 0000000..201f576
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.527.gz
diff --git a/source.local/ap/vim/patches/7.3.528.gz b/source.local/ap/vim/patches/7.3.528.gz
new file mode 100644
index 0000000..5969225
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.528.gz
diff --git a/source.local/ap/vim/patches/7.3.529.gz b/source.local/ap/vim/patches/7.3.529.gz
new file mode 100644
index 0000000..a00e512
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.529.gz
diff --git a/source.local/ap/vim/patches/7.3.530.gz b/source.local/ap/vim/patches/7.3.530.gz
new file mode 100644
index 0000000..e6ae9c8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.530.gz
diff --git a/source.local/ap/vim/patches/7.3.531.gz b/source.local/ap/vim/patches/7.3.531.gz
new file mode 100644
index 0000000..2d33da7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.531.gz
diff --git a/source.local/ap/vim/patches/7.3.532.gz b/source.local/ap/vim/patches/7.3.532.gz
new file mode 100644
index 0000000..a19c77f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.532.gz
diff --git a/source.local/ap/vim/patches/7.3.533.gz b/source.local/ap/vim/patches/7.3.533.gz
new file mode 100644
index 0000000..57e71bf
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.533.gz
diff --git a/source.local/ap/vim/patches/7.3.534.gz b/source.local/ap/vim/patches/7.3.534.gz
new file mode 100644
index 0000000..cce99f9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.534.gz
diff --git a/source.local/ap/vim/patches/7.3.535.gz b/source.local/ap/vim/patches/7.3.535.gz
new file mode 100644
index 0000000..09161a9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.535.gz
diff --git a/source.local/ap/vim/patches/7.3.536.gz b/source.local/ap/vim/patches/7.3.536.gz
new file mode 100644
index 0000000..0f0212f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.536.gz
diff --git a/source.local/ap/vim/patches/7.3.537.gz b/source.local/ap/vim/patches/7.3.537.gz
new file mode 100644
index 0000000..546e3b4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.537.gz
diff --git a/source.local/ap/vim/patches/7.3.538.gz b/source.local/ap/vim/patches/7.3.538.gz
new file mode 100644
index 0000000..b8dafb7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.538.gz
diff --git a/source.local/ap/vim/patches/7.3.539.gz b/source.local/ap/vim/patches/7.3.539.gz
new file mode 100644
index 0000000..7628af7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.539.gz
diff --git a/source.local/ap/vim/patches/7.3.540.gz b/source.local/ap/vim/patches/7.3.540.gz
new file mode 100644
index 0000000..3ce0f0e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.540.gz
diff --git a/source.local/ap/vim/patches/7.3.541.gz b/source.local/ap/vim/patches/7.3.541.gz
new file mode 100644
index 0000000..8fb6961
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.541.gz
diff --git a/source.local/ap/vim/patches/7.3.542.gz b/source.local/ap/vim/patches/7.3.542.gz
new file mode 100644
index 0000000..6ce88ba
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.542.gz
diff --git a/source.local/ap/vim/patches/7.3.543.gz b/source.local/ap/vim/patches/7.3.543.gz
new file mode 100644
index 0000000..d114828
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.543.gz
diff --git a/source.local/ap/vim/patches/7.3.544.gz b/source.local/ap/vim/patches/7.3.544.gz
new file mode 100644
index 0000000..3066b74
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.544.gz
diff --git a/source.local/ap/vim/patches/7.3.545.gz b/source.local/ap/vim/patches/7.3.545.gz
new file mode 100644
index 0000000..e80e909
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.545.gz
diff --git a/source.local/ap/vim/patches/7.3.546.gz b/source.local/ap/vim/patches/7.3.546.gz
new file mode 100644
index 0000000..eab09cc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.546.gz
diff --git a/source.local/ap/vim/patches/7.3.547.gz b/source.local/ap/vim/patches/7.3.547.gz
new file mode 100644
index 0000000..8a9faf3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.547.gz
diff --git a/source.local/ap/vim/patches/7.3.548.gz b/source.local/ap/vim/patches/7.3.548.gz
new file mode 100644
index 0000000..5055f5d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.548.gz
diff --git a/source.local/ap/vim/patches/7.3.549.gz b/source.local/ap/vim/patches/7.3.549.gz
new file mode 100644
index 0000000..34fdb92
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.549.gz
diff --git a/source.local/ap/vim/patches/7.3.550.gz b/source.local/ap/vim/patches/7.3.550.gz
new file mode 100644
index 0000000..9652065
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.550.gz
diff --git a/source.local/ap/vim/patches/7.3.551.gz b/source.local/ap/vim/patches/7.3.551.gz
new file mode 100644
index 0000000..9edf3de
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.551.gz
diff --git a/source.local/ap/vim/patches/7.3.552.gz b/source.local/ap/vim/patches/7.3.552.gz
new file mode 100644
index 0000000..bcd80a8
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.552.gz
diff --git a/source.local/ap/vim/patches/7.3.553.gz b/source.local/ap/vim/patches/7.3.553.gz
new file mode 100644
index 0000000..93e2105
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.553.gz
diff --git a/source.local/ap/vim/patches/7.3.554.gz b/source.local/ap/vim/patches/7.3.554.gz
new file mode 100644
index 0000000..93c4ce9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.554.gz
diff --git a/source.local/ap/vim/patches/7.3.555.gz b/source.local/ap/vim/patches/7.3.555.gz
new file mode 100644
index 0000000..081061d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.555.gz
diff --git a/source.local/ap/vim/patches/7.3.556.gz b/source.local/ap/vim/patches/7.3.556.gz
new file mode 100644
index 0000000..ddeafa9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.556.gz
diff --git a/source.local/ap/vim/patches/7.3.557.gz b/source.local/ap/vim/patches/7.3.557.gz
new file mode 100644
index 0000000..0b1e9b3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.557.gz
diff --git a/source.local/ap/vim/patches/7.3.558.gz b/source.local/ap/vim/patches/7.3.558.gz
new file mode 100644
index 0000000..e78d514
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.558.gz
diff --git a/source.local/ap/vim/patches/7.3.559.gz b/source.local/ap/vim/patches/7.3.559.gz
new file mode 100644
index 0000000..ba1244d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.559.gz
diff --git a/source.local/ap/vim/patches/7.3.560.gz b/source.local/ap/vim/patches/7.3.560.gz
new file mode 100644
index 0000000..629c7d5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.560.gz
diff --git a/source.local/ap/vim/patches/7.3.561.gz b/source.local/ap/vim/patches/7.3.561.gz
new file mode 100644
index 0000000..130191e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.561.gz
diff --git a/source.local/ap/vim/patches/7.3.562.gz b/source.local/ap/vim/patches/7.3.562.gz
new file mode 100644
index 0000000..81ebb33
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.562.gz
diff --git a/source.local/ap/vim/patches/7.3.563.gz b/source.local/ap/vim/patches/7.3.563.gz
new file mode 100644
index 0000000..15643be
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.563.gz
diff --git a/source.local/ap/vim/patches/7.3.564.gz b/source.local/ap/vim/patches/7.3.564.gz
new file mode 100644
index 0000000..fb93254
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.564.gz
diff --git a/source.local/ap/vim/patches/7.3.565.gz b/source.local/ap/vim/patches/7.3.565.gz
new file mode 100644
index 0000000..6e6e280
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.565.gz
diff --git a/source.local/ap/vim/patches/7.3.566.gz b/source.local/ap/vim/patches/7.3.566.gz
new file mode 100644
index 0000000..b0dd736
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.566.gz
diff --git a/source.local/ap/vim/patches/7.3.567.gz b/source.local/ap/vim/patches/7.3.567.gz
new file mode 100644
index 0000000..44ab2ab
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.567.gz
diff --git a/source.local/ap/vim/patches/7.3.568.gz b/source.local/ap/vim/patches/7.3.568.gz
new file mode 100644
index 0000000..e97aa2f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.568.gz
diff --git a/source.local/ap/vim/patches/7.3.569.gz b/source.local/ap/vim/patches/7.3.569.gz
new file mode 100644
index 0000000..b052ee0
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.569.gz
diff --git a/source.local/ap/vim/patches/7.3.570.gz b/source.local/ap/vim/patches/7.3.570.gz
new file mode 100644
index 0000000..b00c8fa
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.570.gz
diff --git a/source.local/ap/vim/patches/7.3.571.gz b/source.local/ap/vim/patches/7.3.571.gz
new file mode 100644
index 0000000..c9c1db1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.571.gz
diff --git a/source.local/ap/vim/patches/7.3.572.gz b/source.local/ap/vim/patches/7.3.572.gz
new file mode 100644
index 0000000..f096c99
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.572.gz
diff --git a/source.local/ap/vim/patches/7.3.573.gz b/source.local/ap/vim/patches/7.3.573.gz
new file mode 100644
index 0000000..97a2528
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.573.gz
diff --git a/source.local/ap/vim/patches/7.3.574.gz b/source.local/ap/vim/patches/7.3.574.gz
new file mode 100644
index 0000000..25a6ff4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.574.gz
diff --git a/source.local/ap/vim/patches/7.3.575.gz b/source.local/ap/vim/patches/7.3.575.gz
new file mode 100644
index 0000000..3c06e50
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.575.gz
diff --git a/source.local/ap/vim/patches/7.3.576.gz b/source.local/ap/vim/patches/7.3.576.gz
new file mode 100644
index 0000000..7769de7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.576.gz
diff --git a/source.local/ap/vim/patches/7.3.577.gz b/source.local/ap/vim/patches/7.3.577.gz
new file mode 100644
index 0000000..7909824
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.577.gz
diff --git a/source.local/ap/vim/patches/7.3.578.gz b/source.local/ap/vim/patches/7.3.578.gz
new file mode 100644
index 0000000..5f22b4d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.578.gz
diff --git a/source.local/ap/vim/patches/7.3.579.gz b/source.local/ap/vim/patches/7.3.579.gz
new file mode 100644
index 0000000..de4ead7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.579.gz
diff --git a/source.local/ap/vim/patches/7.3.580.gz b/source.local/ap/vim/patches/7.3.580.gz
new file mode 100644
index 0000000..9cef836
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.580.gz
diff --git a/source.local/ap/vim/patches/7.3.581.gz b/source.local/ap/vim/patches/7.3.581.gz
new file mode 100644
index 0000000..0eed791
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.581.gz
diff --git a/source.local/ap/vim/patches/7.3.582.gz b/source.local/ap/vim/patches/7.3.582.gz
new file mode 100644
index 0000000..4ffd33b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.582.gz
diff --git a/source.local/ap/vim/patches/7.3.583.gz b/source.local/ap/vim/patches/7.3.583.gz
new file mode 100644
index 0000000..9d3ffc7
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.583.gz
diff --git a/source.local/ap/vim/patches/7.3.584.gz b/source.local/ap/vim/patches/7.3.584.gz
new file mode 100644
index 0000000..da0504b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.584.gz
diff --git a/source.local/ap/vim/patches/7.3.585.gz b/source.local/ap/vim/patches/7.3.585.gz
new file mode 100644
index 0000000..57d4c10
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.585.gz
diff --git a/source.local/ap/vim/patches/7.3.586.gz b/source.local/ap/vim/patches/7.3.586.gz
new file mode 100644
index 0000000..d3e90b1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.586.gz
diff --git a/source.local/ap/vim/patches/7.3.587.gz b/source.local/ap/vim/patches/7.3.587.gz
new file mode 100644
index 0000000..afc1641
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.587.gz
diff --git a/source.local/ap/vim/patches/7.3.588.gz b/source.local/ap/vim/patches/7.3.588.gz
new file mode 100644
index 0000000..f37aa8d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.588.gz
diff --git a/source.local/ap/vim/patches/7.3.589.gz b/source.local/ap/vim/patches/7.3.589.gz
new file mode 100644
index 0000000..a2c4176
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.589.gz
diff --git a/source.local/ap/vim/patches/7.3.590.gz b/source.local/ap/vim/patches/7.3.590.gz
new file mode 100644
index 0000000..2cda256
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.590.gz
diff --git a/source.local/ap/vim/patches/7.3.591.gz b/source.local/ap/vim/patches/7.3.591.gz
new file mode 100644
index 0000000..9b5f7f0
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.591.gz
diff --git a/source.local/ap/vim/patches/7.3.592.gz b/source.local/ap/vim/patches/7.3.592.gz
new file mode 100644
index 0000000..d446c0f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.592.gz
diff --git a/source.local/ap/vim/patches/7.3.593.gz b/source.local/ap/vim/patches/7.3.593.gz
new file mode 100644
index 0000000..2771fa3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.593.gz
diff --git a/source.local/ap/vim/patches/7.3.594.gz b/source.local/ap/vim/patches/7.3.594.gz
new file mode 100644
index 0000000..94ee77b
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.594.gz
diff --git a/source.local/ap/vim/patches/7.3.595.gz b/source.local/ap/vim/patches/7.3.595.gz
new file mode 100644
index 0000000..574aea5
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.595.gz
diff --git a/source.local/ap/vim/patches/7.3.596.gz b/source.local/ap/vim/patches/7.3.596.gz
new file mode 100644
index 0000000..5057299
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.596.gz
diff --git a/source.local/ap/vim/patches/7.3.597.gz b/source.local/ap/vim/patches/7.3.597.gz
new file mode 100644
index 0000000..43266b1
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.597.gz
diff --git a/source.local/ap/vim/patches/7.3.598.gz b/source.local/ap/vim/patches/7.3.598.gz
new file mode 100644
index 0000000..dbe72ba
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.598.gz
diff --git a/source.local/ap/vim/patches/7.3.599.gz b/source.local/ap/vim/patches/7.3.599.gz
new file mode 100644
index 0000000..0430653
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.599.gz
diff --git a/source.local/ap/vim/patches/7.3.600.gz b/source.local/ap/vim/patches/7.3.600.gz
new file mode 100644
index 0000000..3f05fdb
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.600.gz
diff --git a/source.local/ap/vim/patches/7.3.601.gz b/source.local/ap/vim/patches/7.3.601.gz
new file mode 100644
index 0000000..114d9dc
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.601.gz
diff --git a/source.local/ap/vim/patches/7.3.602.gz b/source.local/ap/vim/patches/7.3.602.gz
new file mode 100644
index 0000000..4a539d9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.602.gz
diff --git a/source.local/ap/vim/patches/7.3.603.gz b/source.local/ap/vim/patches/7.3.603.gz
new file mode 100644
index 0000000..a2cc809
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.603.gz
diff --git a/source.local/ap/vim/patches/7.3.604.gz b/source.local/ap/vim/patches/7.3.604.gz
new file mode 100644
index 0000000..433a548
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.604.gz
diff --git a/source.local/ap/vim/patches/7.3.605.gz b/source.local/ap/vim/patches/7.3.605.gz
new file mode 100644
index 0000000..c81b23c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.605.gz
diff --git a/source.local/ap/vim/patches/7.3.606.gz b/source.local/ap/vim/patches/7.3.606.gz
new file mode 100644
index 0000000..1aa6046
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.606.gz
diff --git a/source.local/ap/vim/patches/7.3.607.gz b/source.local/ap/vim/patches/7.3.607.gz
new file mode 100644
index 0000000..a669774
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.607.gz
diff --git a/source.local/ap/vim/patches/7.3.608.gz b/source.local/ap/vim/patches/7.3.608.gz
new file mode 100644
index 0000000..cb72430
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.608.gz
diff --git a/source.local/ap/vim/patches/7.3.609.gz b/source.local/ap/vim/patches/7.3.609.gz
new file mode 100644
index 0000000..e62c873
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.609.gz
diff --git a/source.local/ap/vim/patches/7.3.610.gz b/source.local/ap/vim/patches/7.3.610.gz
new file mode 100644
index 0000000..b9e4ad3
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.610.gz
diff --git a/source.local/ap/vim/patches/7.3.611.gz b/source.local/ap/vim/patches/7.3.611.gz
new file mode 100644
index 0000000..052e511
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.611.gz
diff --git a/source.local/ap/vim/patches/7.3.612.gz b/source.local/ap/vim/patches/7.3.612.gz
new file mode 100644
index 0000000..f149d0a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.612.gz
diff --git a/source.local/ap/vim/patches/7.3.613.gz b/source.local/ap/vim/patches/7.3.613.gz
new file mode 100644
index 0000000..5b4eb65
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.613.gz
diff --git a/source.local/ap/vim/patches/7.3.614.gz b/source.local/ap/vim/patches/7.3.614.gz
new file mode 100644
index 0000000..93bf898
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.614.gz
diff --git a/source.local/ap/vim/patches/7.3.615.gz b/source.local/ap/vim/patches/7.3.615.gz
new file mode 100644
index 0000000..56cdc27
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.615.gz
diff --git a/source.local/ap/vim/patches/7.3.616.gz b/source.local/ap/vim/patches/7.3.616.gz
new file mode 100644
index 0000000..8480c2f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.616.gz
diff --git a/source.local/ap/vim/patches/7.3.617.gz b/source.local/ap/vim/patches/7.3.617.gz
new file mode 100644
index 0000000..2e5ea68
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.617.gz
diff --git a/source.local/ap/vim/patches/7.3.618.gz b/source.local/ap/vim/patches/7.3.618.gz
new file mode 100644
index 0000000..2df638f
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.618.gz
diff --git a/source.local/ap/vim/patches/7.3.619.gz b/source.local/ap/vim/patches/7.3.619.gz
new file mode 100644
index 0000000..ade40cf
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.619.gz
diff --git a/source.local/ap/vim/patches/7.3.620.gz b/source.local/ap/vim/patches/7.3.620.gz
new file mode 100644
index 0000000..1b3a9e9
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.620.gz
diff --git a/source.local/ap/vim/patches/7.3.621.gz b/source.local/ap/vim/patches/7.3.621.gz
new file mode 100644
index 0000000..30f80ec
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.621.gz
diff --git a/source.local/ap/vim/patches/7.3.622.gz b/source.local/ap/vim/patches/7.3.622.gz
new file mode 100644
index 0000000..63b6bea
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.622.gz
diff --git a/source.local/ap/vim/patches/7.3.623.gz b/source.local/ap/vim/patches/7.3.623.gz
new file mode 100644
index 0000000..c1b799c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.623.gz
diff --git a/source.local/ap/vim/patches/7.3.624.gz b/source.local/ap/vim/patches/7.3.624.gz
new file mode 100644
index 0000000..90e71c6
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.624.gz
diff --git a/source.local/ap/vim/patches/7.3.625.gz b/source.local/ap/vim/patches/7.3.625.gz
new file mode 100644
index 0000000..225b816
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.625.gz
diff --git a/source.local/ap/vim/patches/7.3.626.gz b/source.local/ap/vim/patches/7.3.626.gz
new file mode 100644
index 0000000..b974c1a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.626.gz
diff --git a/source.local/ap/vim/patches/7.3.627.gz b/source.local/ap/vim/patches/7.3.627.gz
new file mode 100644
index 0000000..705cf9d
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.627.gz
diff --git a/source.local/ap/vim/patches/7.3.628.gz b/source.local/ap/vim/patches/7.3.628.gz
new file mode 100644
index 0000000..947e640
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.628.gz
diff --git a/source.local/ap/vim/patches/7.3.629.gz b/source.local/ap/vim/patches/7.3.629.gz
new file mode 100644
index 0000000..0a82329
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.629.gz
diff --git a/source.local/ap/vim/patches/7.3.630.gz b/source.local/ap/vim/patches/7.3.630.gz
new file mode 100644
index 0000000..7540a45
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.630.gz
diff --git a/source.local/ap/vim/patches/7.3.631.gz b/source.local/ap/vim/patches/7.3.631.gz
new file mode 100644
index 0000000..688e21c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.631.gz
diff --git a/source.local/ap/vim/patches/7.3.632.gz b/source.local/ap/vim/patches/7.3.632.gz
new file mode 100644
index 0000000..783b643
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.632.gz
diff --git a/source.local/ap/vim/patches/7.3.633.gz b/source.local/ap/vim/patches/7.3.633.gz
new file mode 100644
index 0000000..ed1c861
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.633.gz
diff --git a/source.local/ap/vim/patches/7.3.634.gz b/source.local/ap/vim/patches/7.3.634.gz
new file mode 100644
index 0000000..905e55e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.634.gz
diff --git a/source.local/ap/vim/patches/7.3.635.gz b/source.local/ap/vim/patches/7.3.635.gz
new file mode 100644
index 0000000..7aa840e
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.635.gz
diff --git a/source.local/ap/vim/patches/7.3.636.gz b/source.local/ap/vim/patches/7.3.636.gz
new file mode 100644
index 0000000..c326d85
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.636.gz
diff --git a/source.local/ap/vim/patches/7.3.637.gz b/source.local/ap/vim/patches/7.3.637.gz
new file mode 100644
index 0000000..dfd14da
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.637.gz
diff --git a/source.local/ap/vim/patches/7.3.638.gz b/source.local/ap/vim/patches/7.3.638.gz
new file mode 100644
index 0000000..019610c
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.638.gz
diff --git a/source.local/ap/vim/patches/7.3.639.gz b/source.local/ap/vim/patches/7.3.639.gz
new file mode 100644
index 0000000..5430f60
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.639.gz
diff --git a/source.local/ap/vim/patches/7.3.640.gz b/source.local/ap/vim/patches/7.3.640.gz
new file mode 100644
index 0000000..817c2ee
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.640.gz
diff --git a/source.local/ap/vim/patches/7.3.641.gz b/source.local/ap/vim/patches/7.3.641.gz
new file mode 100644
index 0000000..77ccbd4
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.641.gz
diff --git a/source.local/ap/vim/patches/7.3.642.gz b/source.local/ap/vim/patches/7.3.642.gz
new file mode 100644
index 0000000..a3e1339
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.642.gz
diff --git a/source.local/ap/vim/patches/7.3.643.gz b/source.local/ap/vim/patches/7.3.643.gz
new file mode 100644
index 0000000..85f6553
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.643.gz
diff --git a/source.local/ap/vim/patches/7.3.644.gz b/source.local/ap/vim/patches/7.3.644.gz
new file mode 100644
index 0000000..880a8b2
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.644.gz
diff --git a/source.local/ap/vim/patches/7.3.645.gz b/source.local/ap/vim/patches/7.3.645.gz
new file mode 100644
index 0000000..823e95a
--- /dev/null
+++ b/source.local/ap/vim/patches/7.3.645.gz
diff --git a/source.local/ap/zsh/zsh.SlackBuild b/source.local/ap/zsh/zsh.SlackBuild
index 72b7daa..7e11014 100755
--- a/source.local/ap/zsh/zsh.SlackBuild
+++ b/source.local/ap/zsh/zsh.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
@@ -24,38 +24,39 @@
 
 
 PKGNAM=zsh
-VERSION=${VERSION:-$(echo ${PKGNAM}-4.*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-5.0.2}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -81,9 +82,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# fix regex crash:
-zcat $CWD/zsh.regex.oh.bah.diff.gz | patch -p0 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -97,7 +95,7 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 mv $PKG/usr/bin $PKG
-( cd $PKG/bin ; ln -sf zsh $PKGNAM-$VERSION )
+( cd $PKG/bin ; ln -sf zsh zsh-$VERSION )
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source.local/ap/zsh/zsh.regex.oh.bah.diff.gz b/source.local/ap/zsh/zsh.regex.oh.bah.diff.gz
deleted file mode 100644
index b7d3310..0000000
--- a/source.local/ap/zsh/zsh.regex.oh.bah.diff.gz
+++ /dev/null
diff --git a/source.local/d/cmake/cmake.SlackBuild b/source.local/d/cmake/cmake.SlackBuild
index 201ef0f..27b74f5 100755
--- a/source.local/d/cmake/cmake.SlackBuild
+++ b/source.local/d/cmake/cmake.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 
 PKGNAM=cmake
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.8.10.2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -75,8 +75,6 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION
 
-zcat $CWD/cmake.findpkgconfig.3ea850.patch.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source.local/d/cmake/cmake.findpkgconfig.3ea850.patch.gz b/source.local/d/cmake/cmake.findpkgconfig.3ea850.patch.gz
deleted file mode 100644
index 82ec26e..0000000
--- a/source.local/d/cmake/cmake.findpkgconfig.3ea850.patch.gz
+++ /dev/null
diff --git a/source.local/d/libtool/libtool.SlackBuild b/source.local/d/libtool/libtool.SlackBuild
index 4d70d10..e96a94a 100755
--- a/source.local/d/libtool/libtool.SlackBuild
+++ b/source.local/d/libtool/libtool.SlackBuild
@@ -23,42 +23,39 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.4.2}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-libtool
+NUMJOBS=${NUMJOBS:--j7}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -66,6 +63,10 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-libtool
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
diff --git a/source.local/d/llvm/llvm.SlackBuild b/source.local/d/llvm/llvm.SlackBuild
index ff0bf6f..48d88e0 100755
--- a/source.local/d/llvm/llvm.SlackBuild
+++ b/source.local/d/llvm/llvm.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for llvm
 
-# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
 
 PKGNAM=llvm
-VERSION=3.0
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -70,38 +71,24 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-CLANG=${CLANG:-yes}
-
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-${VERSION}.src
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PKGNAM-$VERSION.src.tar.xz || exit 1
 
-if [ "$CLANG" = "no" ]; then
-  cd $PKGNAM-${VERSION}.src
-else
-  cd $PKGNAM-${VERSION}.src/tools
+cd $PKGNAM-${VERSION}.src/tools
   rm -rf clang clang-${VERSION}.src
-  tar xvf $CWD/clang-$VERSION.tar.xz
-  mv clang-${VERSION}.src clang
-  cd ../
-
-  # clang fixes for slackware
-  # No longer needed as of llvm/clang 3.0?
-  #patch -p1 -d tools/clang -i $CWD/clang-slackware.diff
-fi
+  tar xvf $CWD/clang-$VERSION.src.tar.xz || exit 1
+  mv clang-${VERSION}.src clang || exit 1
+cd ../
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CINC="/usr/include/"
-GCCDIR=/usr/lib$LIBDIRSUFFIX/gcc/$ARCH-slackware-linux*/*/
-CINC="$CINC:$(echo ${GCCDIR})/include/"
-CINC="$CINC:$(echo ${GCCDIR})/include-fixed/"
-
 # --mandir doesn't work currently
 # need to disable assertions to make llvm thread-safe
+# clang resource dir is a relative path based on the location of the clang binary
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -113,49 +100,64 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-optimized \
   --disable-assertions \
   --enable-pic \
-  --with-c-include-dirs=$CINC \
+  --with-clang-resource-dir="../lib${LIBDIRSUFFIX}/clang/${VERSION}" \
   --build=$TARGET \
   --host=$TARGET || exit 1
 
-# Correct libdir setting
+# Fix hardcoded libdir
 sed -i "s|\$(PROJ_prefix)/lib|\$(PROJ_prefix)/lib$LIBDIRSUFFIX|" \
   Makefile.config
-
-if [ "$CLANG" != "no" ]; then
-  sed -i "s|\$(PROJ_prefix)/lib|\$(PROJ_prefix)/lib$LIBDIRSUFFIX|" \
-    tools/clang/lib/Headers/Makefile
-fi
+sed -i "s|\$(PROJ_prefix)/lib|\$(PROJ_prefix)/lib$LIBDIRSUFFIX|" \
+  tools/clang/lib/Headers/Makefile
+sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" \
+  tools/clang/lib/Frontend/CompilerInvocation.cpp
+sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" \
+  tools/clang/lib/Driver/Tools.cpp
+sed -i "s|ActiveLibDir = ActivePrefix + \"/lib\"|ActiveLibDir = ActivePrefix + \"/lib${LIBDIRSUFFIX}\"|g" \
+  tools/llvm-config/llvm-config.cpp
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-if [ "$CLANG" != "no" ]; then
-  # install clang-static-analyzer
-  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer
-  cp -pr tools/clang/tools/scan-{build,view} \
-    $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer/ || exit 1
-  for i in scan-{build,view}; do
-    ln -s /usr/lib$LIBDIRSUFFIX/clang-analyzer/$i/$i \
-      $PKG/usr/bin/$i || exit 1
-  done
-  for i in ccc c++; do
-    ln -s /usr/lib$LIBDIRSUFFIX/clang-analyzer/scan-build/$i-analyzer \
-      $PKG/usr/bin/$i-analyzer || exit 1
-  done
-fi
+# Add symlinks for $ARCH-slackware-linux-{clang,clang++}:
+( cd $PKG/usr/bin
+  ln -sf clang $TARGET-clang
+  ln -sf clang++ $TARGET-clang++
+)
+
+# install clang-static-analyzer
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer
+cp -pr tools/clang/tools/scan-{build,view} \
+  $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer/ || exit 1
+for i in scan-{build,view}; do
+  ln -s /usr/lib$LIBDIRSUFFIX/clang-analyzer/$i/$i \
+    $PKG/usr/bin/$i || exit 1
+done
+for i in ccc c++; do
+  ln -s /usr/lib$LIBDIRSUFFIX/clang-analyzer/scan-build/$i-analyzer \
+    $PKG/usr/bin/$i-analyzer || exit 1
+done
+
+# Fix paths in scan-build
+sed -i "s|\$RealBin/bin|/usr/bin|" \
+  $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer/scan-build/scan-build
+sed -i "s|\$RealBin/sorttable.js|/usr/lib${LIBDIRSUFFIX}/clang-analyzer/scan-build/sorttable.js|" \
+  $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer/scan-build/scan-build
+sed -i "s|\$RealBin/scanview.css|/usr/lib${LIBDIRSUFFIX}/clang-analyzer/scan-build/scanview.css|" \
+  $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer/scan-build/scan-build
 
 # Remove example libraries
 rm -f $PKG/usr/lib$LIBDIRSUFFIX/LLVMHello*
 
-# Fix wrong libdir
-sed -i -e "s|ABS_RUN_DIR/lib\"|ABS_RUN_DIR/lib$LIBDIRSUFFIX\"|" \
-  $PKG/usr/bin/llvm-config
-
 # Move man page directory:
 mv $PKG/usr/share/man $PKG/usr/
 # Try to remove /usr/share, which should be empty now.  If it's not, fine.
 rmdir $PKG/usr/share
 
+# Move scan-build man-page into place
+mv $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer/scan-build/scan-build.1 \
+  $PKG/usr/man/man1/
+
 # Strip binaries:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -169,17 +171,13 @@ for i in $( find $PKG/usr/man -type l ) ; do
   rm $i
 done
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/clang
 cp -a CREDITS* LICENSE* README* $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a tools/clang/{INSTALL,LICENSE,NOTES,README}* \
+  $PKG/usr/doc/$PKGNAM-$VERSION/clang
 mv $PKG/usr/docs/llvm/* $PKG/usr/doc/$PKGNAM-$VERSION
 rm -rf $PKG/usr/docs
 
-if [ "$CLANG" != "no" ]; then
-  mkdir $PKG/usr/doc/$PKGNAM-$VERSION/clang
-  cp -a tools/clang/{INSTALL,NOTES,README,TODO}* \
-    $PKG/usr/doc/$PKGNAM-$VERSION/clang
-fi
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source.local/d/oprofile/oprofile-0.9.6_mutable.diff.gz b/source.local/d/oprofile/oprofile-0.9.6_mutable.diff.gz
deleted file mode 100644
index b5031e7..0000000
--- a/source.local/d/oprofile/oprofile-0.9.6_mutable.diff.gz
+++ /dev/null
diff --git a/source.local/d/oprofile/oprofile.SlackBuild b/source.local/d/oprofile/oprofile.SlackBuild
index 31ecfa8..390bd21 100755
--- a/source.local/d/oprofile/oprofile.SlackBuild
+++ b/source.local/d/oprofile/oprofile.SlackBuild
@@ -20,11 +20,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
-
-VERSION=${VERSION:-$(echo oprofile-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.9.7}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -72,7 +70,7 @@ tar xvf $CWD/oprofile-$VERSION.tar.?z* || exit 1
 cd oprofile-$VERSION
 
 zcat $CWD/oprofile.binutils.diff.gz | patch -p1 --verbose || exit 1
-#zcat $CWD/oprofile-0.9.6_mutable.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/oprofile.config.h.diff.gz | patch -p1 --verbose || exit 1
 
 ./autogen.sh
 
diff --git a/source.local/d/oprofile/oprofile.config.h.diff.gz b/source.local/d/oprofile/oprofile.config.h.diff.gz
new file mode 100644
index 0000000..50a5a11
--- /dev/null
+++ b/source.local/d/oprofile/oprofile.config.h.diff.gz
diff --git a/source.local/extra/source/xf86-video-fbdev/slack-desc b/source.local/extra/source/xf86-video-fbdev/slack-desc
new file mode 100644
index 0000000..08a636a
--- /dev/null
+++ b/source.local/extra/source/xf86-video-fbdev/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 ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+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:
+xf86-video-fbdev:
+xf86-video-fbdev:
+xf86-video-fbdev:
diff --git a/source.local/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild b/source.local/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild
new file mode 100755
index 0000000..2bf7dbd
--- /dev/null
+++ b/source.local/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=xf86-video-fbdev
+VERSION=${VERSION:-0.4.3}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+# xorg-server 1.14 and later -
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
+
+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 {} \;
+
+# Configure:
+CFLAGS=$SLKCFLAGS \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/xf86-video-fbdev-$VERSION \
+  --disable-static \
+  --build=$TARGET
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/k/configs-armv7hl/config-tegra-3.8.4 b/source.local/k/configs-armv7hl/config-tegra-3.8.4
new file mode 100644
index 0000000..c9fec61
--- /dev/null
+++ b/source.local/k/configs-armv7hl/config-tegra-3.8.4
@@ -0,0 +1,4138 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 3.8.4 Kernel Configuration
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION="-tegra"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_FHANDLE=y
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_SPARSE_IRQ=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_NOCB_CPU is not set
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+# CONFIG_CPUSETS is not set
+CONFIG_CGROUP_CPUACCT=y
+# CONFIG_RESOURCE_COUNTERS is not set
+# CONFIG_CGROUP_PERF is not set
+# CONFIG_CGROUP_SCHED is not set
+# CONFIG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+# CONFIG_PID_NS is not set
+CONFIG_NET_NS=y
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
+CONFIG_HAVE_UID16=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_ACORN_PARTITION=y
+# CONFIG_ACORN_PARTITION_CUMANA is not set
+# CONFIG_ACORN_PARTITION_EESOX is not set
+CONFIG_ACORN_PARTITION_ICS=y
+# CONFIG_ACORN_PARTITION_ADFS is not set
+# CONFIG_ACORN_PARTITION_POWERTEC is not set
+CONFIG_ACORN_PARTITION_RISCIX=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_ASN1=m
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_MULTIPLATFORM is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_LPC32XX is not set
+CONFIG_ARCH_TEGRA=y
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_VT8500_SINGLE is not set
+CONFIG_GPIO_PCA953X=m
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+
+#
+# NVIDIA Tegra options
+#
+CONFIG_ARCH_TEGRA_2x_SOC=y
+CONFIG_ARCH_TEGRA_3x_SOC=y
+CONFIG_TEGRA_PCI=y
+CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+# CONFIG_ARCH_VT8500 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_LPAE is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+# CONFIG_ARM_VIRT_EXT is not set
+CONFIG_SWP_EMULATE=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_CACHE_L2X0=y
+CONFIG_CACHE_PL310=y
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARM_NR_BANKS=8
+CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_458693=y
+CONFIG_ARM_ERRATA_460075=y
+CONFIG_ARM_ERRATA_742230=y
+CONFIG_ARM_ERRATA_742231=y
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_PL310_ERRATA_727915=y
+CONFIG_ARM_ERRATA_743622=y
+CONFIG_ARM_ERRATA_751472=y
+CONFIG_PL310_ERRATA_753970=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_764369=y
+CONFIG_PL310_ERRATA_769419=y
+CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_GIC=y
+
+#
+# Bus support
+#
+CONFIG_PCI=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_HAVE_SMP=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_HAVE_ARM_TWD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_NR_CPUS=4
+CONFIG_HOTPLUG_CPU=y
+CONFIG_LOCAL_TIMERS=y
+CONFIG_ARCH_NR_GPIO=1024
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=100
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_ALIGNMENT_TRAP=y
+CONFIG_UACCESS_WITH_MEMCPY=y
+# CONFIG_SECCOMP is not set
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_XEN is not set
+
+#
+# Boot options
+#
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE=""
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_AUTO_ZRELADDR=y
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_APM_EMULATION is not set
+CONFIG_PM_CLK=y
+CONFIG_CPU_PM=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_NET_IPVTI is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_NETLABEL is not set
+CONFIG_NETWORK_SECMARK=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+# CONFIG_NF_CONNTRACK_ZONES is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+# CONFIG_NF_CONNTRACK_SNMP is not set
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_IP_SET is not set
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+# CONFIG_IP_VS_PROTO_SCTP is not set
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_NET_DCCPPROBE is not set
+CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set
+# CONFIG_RDS is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_PORTS=8191
+CONFIG_ATM=m
+# CONFIG_ATM_CLIP is not set
+# CONFIG_ATM_LANE is not set
+# CONFIG_ATM_BR2684 is not set
+# CONFIG_L2TP is not set
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+# CONFIG_IPX is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+CONFIG_X25=m
+# CONFIG_LAPB is not set
+CONFIG_WAN_ROUTER=m
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_6LOWPAN is not set
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+# CONFIG_NET_SCH_SFB is not set
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+# CONFIG_NETPRIO_CGROUP is not set
+CONFIG_BQL=y
+# CONFIG_BPF_JIT is not set
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+# CONFIG_BPQETHER is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_YAM is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+# CONFIG_CAN_GW is not set
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_SLCAN is not set
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_MCP251X=m
+# CONFIG_PCH_CAN is not set
+# CONFIG_CAN_GRCAN is not set
+CONFIG_CAN_SJA1000=m
+# CONFIG_CAN_SJA1000_ISA is not set
+CONFIG_CAN_SJA1000_PLATFORM=m
+# CONFIG_CAN_SJA1000_OF_PLATFORM is not set
+CONFIG_CAN_EMS_PCI=m
+# CONFIG_CAN_PEAK_PCI is not set
+CONFIG_CAN_KVASER_PCI=m
+# CONFIG_CAN_PLX_PCI is not set
+# CONFIG_CAN_C_CAN is not set
+# CONFIG_CAN_CC770 is not set
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+# CONFIG_CAN_ESD_USB2 is not set
+# CONFIG_CAN_KVASER_USB is not set
+# CONFIG_CAN_PEAK_USB is not set
+CONFIG_CAN_SOFTING=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_BNEP is not set
+# CONFIG_BT_HIDP is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+# CONFIG_BT_HCIUART is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+# CONFIG_BT_ATH3K is not set
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+# CONFIG_NFC is not set
+CONFIG_HAVE_BPF_JIT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_MMIO=m
+# CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_CMA is not set
+
+#
+# Bus devices
+#
+CONFIG_CONNECTOR=m
+CONFIG_MTD=y
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_FTL=y
+CONFIG_NFTL=y
+# CONFIG_NFTL_RW is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_OF=m
+# CONFIG_MTD_IMPA7 is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+CONFIG_MTD_M25P80=y
+CONFIG_M25PXX_USE_FAST_READ=y
+CONFIG_MTD_SST25L=m
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_NAND_ECC=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_DENALI is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+
+#
+# Device Tree and Open Firmware support
+#
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_OF_SELFTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=m
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_MTD=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_MG_DISK=m
+CONFIG_MG_DISK_RES=0
+CONFIG_BLK_DEV_RBD=m
+
+#
+# Misc devices
+#
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_ATMEL_PWM is not set
+# CONFIG_PHANTOM is not set
+CONFIG_INTEL_MID_PTI=m
+# CONFIG_SGI_IOC4 is not set
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+CONFIG_SCSI_BNX2_ISCSI=m
+# CONFIG_SCSI_BNX2X_FCOE is not set
+CONFIG_BE2ISCSI=m
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+# CONFIG_SCSI_PM8001 is not set
+CONFIG_SCSI_SRP=m
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
+CONFIG_SCSI_DH=m
+# CONFIG_SCSI_DH_RDAC is not set
+# CONFIG_SCSI_DH_HP_SW is not set
+# CONFIG_SCSI_DH_EMC is not set
+# CONFIG_SCSI_DH_ALUA is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_HIGHBANK is not set
+CONFIG_SATA_MV=m
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+CONFIG_PATA_CS5536=m
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+# CONFIG_DM_THIN_PROVISIONING is not set
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+# CONFIG_DM_LOG_USERSPACE is not set
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_VERITY is not set
+CONFIG_TARGET_CORE=m
+# CONFIG_TCM_IBLOCK is not set
+# CONFIG_TCM_FILEIO is not set
+# CONFIG_TCM_PSCSI is not set
+# CONFIG_LOOPBACK_TARGET is not set
+# CONFIG_ISCSI_TARGET is not set
+# CONFIG_SBP_TARGET is not set
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_I2O is not set
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_MII=y
+CONFIG_IFB=m
+# CONFIG_NET_TEAM is not set
+CONFIG_MACVLAN=m
+# CONFIG_MACVTAP is not set
+# CONFIG_VXLAN is not set
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+# CONFIG_ARCNET is not set
+# CONFIG_ATM_DRIVERS is not set
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_ARM_AT91_ETHER is not set
+# CONFIG_MACB is not set
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+# CONFIG_BNX2X is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_HP is not set
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGBVF=m
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+# CONFIG_MVMDIO is not set
+# CONFIG_SKGE is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+# CONFIG_ETHOC is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_SFC is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_AT803X_PHY=m
+# CONFIG_AMD_PHY is not set
+CONFIG_MARVELL_PHY=y
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+CONFIG_BCM87XX_PHY=m
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+# CONFIG_PPTP is not set
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+# CONFIG_USB_NET_CDC_MBIM is not set
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+# CONFIG_USB_NET_QMI_WWAN is not set
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_WLAN=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_MWL8K=m
+# CONFIG_ATH_CARDS is not set
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_BCMA_EXTRA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_SDIO is not set
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+# CONFIG_B43_PHY_N is not set
+CONFIG_B43_PHY_LP=y
+# CONFIG_B43_PHY_HT is not set
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+# CONFIG_BRCMSMAC is not set
+# CONFIG_BRCMFMAC is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+# CONFIG_IPW2100 is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IWLWIFI is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS_MESH is not set
+# CONFIG_HERMES is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+# CONFIG_RTL8723AE is not set
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+# CONFIG_WL_TI is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+# CONFIG_MWIFIEX_PCIE is not set
+# CONFIG_MWIFIEX_USB is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+# CONFIG_IEEE802154_FAKELB is not set
+# CONFIG_IEEE802154_AT86RF230 is not set
+# CONFIG_IEEE802154_MRF24J40 is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_SPARSEKMAP is not set
+CONFIG_INPUT_MATRIXKMAP=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+# CONFIG_KEYBOARD_LM8333 is not set
+CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_MCS is not set
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_TEGRA=y
+CONFIG_KEYBOARD_OPENCORES=m
+# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+# CONFIG_JOYSTICK_AS5011 is not set
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+CONFIG_GAMEPORT=m
+# CONFIG_GAMEPORT_NS558 is not set
+# CONFIG_GAMEPORT_L4 is not set
+# CONFIG_GAMEPORT_EMU10K1 is not set
+# CONFIG_GAMEPORT_FM801 is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+CONFIG_DEVKMEM=y
+# CONFIG_STALDRV is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EM is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_MFD_HSU is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_PCH_UART is not set
+CONFIG_SERIAL_XILINX_PS_UART=m
+# CONFIG_SERIAL_ARC is not set
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_DCC=y
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_HW_RANDOM_EXYNOS is not set
+CONFIG_HW_RANDOM_TPM=m
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
+CONFIG_TCG_ATMEL=m
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+CONFIG_I2C_ISCH=m
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_INTEL_MID is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_TEGRA=m
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TEGRA20_SFLASH is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_TLE62X0=m
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA20=y
+CONFIG_PINCTRL_TEGRA30=y
+# CONFIG_PINCTRL_EXYNOS is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+CONFIG_OF_GPIO=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers:
+#
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_VX855 is not set
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX7300 is not set
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCF857X=m
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
+
+#
+# PCI GPIO expanders:
+#
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_RDC321X is not set
+
+#
+# SPI GPIO expanders:
+#
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MCP23S08=m
+CONFIG_GPIO_MC33880=m
+# CONFIG_GPIO_74X164 is not set
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_GPIO is not set
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
+# CONFIG_W1_SLAVE_DS2423 is not set
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+CONFIG_W1_SLAVE_BQ27000=m
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_AVS is not set
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADCXX=m
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+CONFIG_SENSORS_ADM1029=m
+# CONFIG_SENSORS_ADM1031 is not set
+CONFIG_SENSORS_ADM9240=m
+# CONFIG_SENSORS_ADT7410 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+# CONFIG_SENSORS_ASC7621 is not set
+CONFIG_SENSORS_ATXP1=m
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_DS1621 is not set
+CONFIG_SENSORS_I5K_AMB=m
+# CONFIG_SENSORS_F71805F is not set
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LM63 is not set
+CONFIG_SENSORS_LM70=m
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+CONFIG_SENSORS_LM93=m
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+CONFIG_SENSORS_LTC4245=m
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+CONFIG_SENSORS_PC87427=m
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+CONFIG_SENSORS_DME1737=m
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+CONFIG_SENSORS_EMC6W201=m
+# CONFIG_SENSORS_SMSC47M1 is not set
+CONFIG_SENSORS_SMSC47M192=m
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_INA2XX is not set
+CONFIG_SENSORS_THMC50=m
+# CONFIG_SENSORS_TMP102 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+# CONFIG_SENSORS_VIA686A is not set
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+# CONFIG_SENSORS_W83781D is not set
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+CONFIG_SENSORS_W83L786NG=m
+# CONFIG_SENSORS_W83627HF is not set
+CONFIG_SENSORS_W83627EHF=m
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_MPCORE_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+# CONFIG_BCMA_HOST_PCI is not set
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+CONFIG_UCB1400_CORE=m
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_TPS6105X is not set
+CONFIG_TPS65010=m
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_TIMBERDALE is not set
+CONFIG_LPC_SCH=m
+# CONFIG_LPC_ICH is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_RETU is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+CONFIG_REGULATOR_MAX1586=m
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+CONFIG_REGULATOR_LP3971=m
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+
+#
+# Media drivers
+#
+# CONFIG_MEDIA_USB_SUPPORT is not set
+# CONFIG_MEDIA_PCI_SUPPORT is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+
+#
+# Customise DVB Frontends
+#
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_DRM is not set
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_WMT_GE_ROPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+CONFIG_BACKLIGHT_ADP8870=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+# CONFIG_FB_SSD1307 is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_MIXER_OSS is not set
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_HRTIMER=m
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5535AUDIO is not set
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+CONFIG_SND_HDSPM=m
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+CONFIG_SND_VIRTUOSO=m
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_UA101 is not set
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_FIREWIRE is not set
+CONFIG_SND_SOC=m
+# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_WM_ADSP=m
+CONFIG_SND_SOC_AD1836=m
+CONFIG_SND_SOC_AD193X=m
+CONFIG_SND_SOC_AD73311=m
+CONFIG_SND_SOC_ADAU1373=m
+CONFIG_SND_SOC_ADAV80X=m
+CONFIG_SND_SOC_ADS117X=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4535=m
+CONFIG_SND_SOC_AK4641=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK4671=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_ALC5632=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CX20442=m
+CONFIG_SND_SOC_JZ4740_CODEC=m
+CONFIG_SND_SOC_L3=m
+CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_DA732X=m
+CONFIG_SND_SOC_DA9055=m
+CONFIG_SND_SOC_DFBMCS320=m
+CONFIG_SND_SOC_ISABELLE=m
+CONFIG_SND_SOC_LM49453=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98095=m
+CONFIG_SND_SOC_MAX9850=m
+CONFIG_SND_SOC_PCM3008=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA529=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC26=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320DAC33=m
+CONFIG_SND_SOC_UDA134X=m
+CONFIG_SND_SOC_UDA1380=m
+CONFIG_SND_SOC_WM0010=m
+CONFIG_SND_SOC_WM1250_EV1=m
+CONFIG_SND_SOC_WM2000=m
+CONFIG_SND_SOC_WM2200=m
+CONFIG_SND_SOC_WM5100=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8727=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8900=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8955=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8971=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8983=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WM8988=m
+CONFIG_SND_SOC_WM8990=m
+CONFIG_SND_SOC_WM8991=m
+CONFIG_SND_SOC_WM8993=m
+CONFIG_SND_SOC_WM8995=m
+CONFIG_SND_SOC_WM8996=m
+CONFIG_SND_SOC_WM9081=m
+CONFIG_SND_SOC_WM9090=m
+CONFIG_SND_SOC_LM4857=m
+CONFIG_SND_SOC_MAX9768=m
+CONFIG_SND_SOC_MAX9877=m
+CONFIG_SND_SOC_ML26124=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+# CONFIG_UHID is not set
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACRUX is not set
+CONFIG_HID_APPLE=m
+# CONFIG_HID_AUREAL is not set
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+# CONFIG_HID_PRODIKEYS is not set
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_HID_EMS_FF is not set
+CONFIG_HID_EZKEY=m
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_KEYTOUCH is not set
+CONFIG_HID_KYE=m
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+# CONFIG_LOGIG940_FF is not set
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+# CONFIG_HID_MULTITOUCH is not set
+CONFIG_HID_NTRIG=m
+# CONFIG_HID_ORTEK is not set
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+# CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+# CONFIG_GREENASIA_FF is not set
+CONFIG_HID_SMARTJOYPLUS=m
+# CONFIG_SMARTJOYPLUS_FF is not set
+# CONFIG_HID_TIVO is not set
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_HID_ZEROPLUS=m
+# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HID_SENSOR_HUB is not set
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+# CONFIG_I2C_HID is not set
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_XHCI_HCD is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_TEGRA=y
+CONFIG_USB_OXU210HP_HCD=m
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+# CONFIG_USB_SERIAL_CP210X is not set
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+# CONFIG_USB_SERIAL_F81232 is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_METRO is not set
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+CONFIG_USB_SERIAL_ZTE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+# CONFIG_USB_TRANCEVIBRATOR is not set
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_RCAR_PHY is not set
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FUSB300 is not set
+CONFIG_USB_R8A66597=m
+CONFIG_USB_MV_UDC=m
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_DUMMY_HCD is not set
+CONFIG_USB_LIBCOMPOSITE=m
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FUNCTIONFS is not set
+CONFIG_USB_MASS_STORAGE=m
+# CONFIG_USB_GADGET_TARGET is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+# CONFIG_MMC_SDHCI_PCI is not set
+CONFIG_MMC_SDHCI_PLTFM=m
+# CONFIG_MMC_SDHCI_TEGRA is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+# CONFIG_MMC_DW is not set
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+# CONFIG_MEMSTICK_R592 is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_LP3944=m
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+CONFIG_RTC_DRV_PCF2123=m
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_TEGRA=y
+# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+# CONFIG_DW_DMAC is not set
+# CONFIG_TEGRA20_APB_DMA is not set
+# CONFIG_TIMB_DMA is not set
+# CONFIG_AUXDISPLAY is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
+# CONFIG_UIO_AEC is not set
+CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_PCI_GENERIC is not set
+# CONFIG_UIO_NETX is not set
+
+#
+# Virtio drivers
+#
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_MMIO is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_STAGING=y
+# CONFIG_ET131X is not set
+CONFIG_USBIP_CORE=m
+# CONFIG_USBIP_VHCI_HCD is not set
+# CONFIG_USBIP_HOST is not set
+# CONFIG_USBIP_DEBUG is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_R8187SE is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_R8712U is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_ZSMALLOC is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_CRYSTALHD is not set
+CONFIG_FB_XGI=m
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_MFD_NVEC is not set
+CONFIG_STAGING_MEDIA=y
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# CONFIG_USB_WPAN_HCD is not set
+# CONFIG_USB_G_CCG is not set
+# CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_CSR_WIFI is not set
+# CONFIG_ZCACHE2 is not set
+CONFIG_NET_VENDOR_SILICOM=y
+# CONFIG_SBYPASS is not set
+# CONFIG_BPCTL is not set
+# CONFIG_CED1401 is not set
+# CONFIG_DGRP is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+# CONFIG_COMMON_CLK_DEBUG is not set
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKSRC_MMIO=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_OF_IOMMU=y
+# CONFIG_TEGRA_IOMMU_GART is not set
+# CONFIG_TEGRA_IOMMU_SMMU is not set
+
+#
+# Remoteproc drivers (EXPERIMENTAL)
+#
+# CONFIG_STE_MODEM_RPROC is not set
+
+#
+# Rpmsg drivers (EXPERIMENTAL)
+#
+# CONFIG_VIRT_DRIVERS is not set
+# CONFIG_PM_DEVFREQ is not set
+# CONFIG_EXTCON is not set
+# CONFIG_MEMORY is not set
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
+# CONFIG_IPACK_BUS is not set
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_LOGFS is not set
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XZ is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+# CONFIG_QNX6FS_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+# CONFIG_PSTORE is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+# CONFIG_F2FS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_ACL is not set
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB2 is not set
+# CONFIG_CIFS_FSCACHE is not set
+CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+# CONFIG_NCPFS_SMALLDOS is not set
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_LKDTM is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+CONFIG_RBTREE_TEST=m
+CONFIG_INTERVAL_TREE_TEST=m
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_ARM_UNWIND=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+# CONFIG_ARM_KPROBES_TEST is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_TRUSTED_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_USER is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_PCRYPT is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=y
+CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+# CONFIG_CRYPTO_DEV_TEGRA_AES is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+# CONFIG_DDR is not set
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
diff --git a/source.local/k/k.SlackBuild b/source.local/k/k.SlackBuild
index 06d93f2..c97bc75 100755
--- a/source.local/k/k.SlackBuild
+++ b/source.local/k/k.SlackBuild
@@ -6,7 +6,7 @@
 
 
 PLATFORM=${1:-tegra}
-KVER=${KVER:-3.2.29}
+KVER=${KVER:-3.8.4}
 BUILD=${BUILD:-1}
 
 
diff --git a/source.local/k/kernel-tegra/kernel-tegra.SlackBuild b/source.local/k/kernel-tegra/kernel-tegra.SlackBuild
index 5c79116..c3b6db2 100755
--- a/source.local/k/kernel-tegra/kernel-tegra.SlackBuild
+++ b/source.local/k/kernel-tegra/kernel-tegra.SlackBuild
@@ -22,7 +22,7 @@
 
 
 KERNNAME=tegra
-VERSION=${VERSION:-3.2.29}
+VERSION=${VERSION:-3.8.4}
 ARCH=${ARCH:-armv7hl}
 KARCH=${KARCH:-arm}
 BUILD=${BUILD:-1}
diff --git a/source.local/k/sources/linux-3.2.29.tar.sign b/source.local/k/sources/linux-3.2.29.tar.sign
deleted file mode 100644
index 7a5d986..0000000
--- a/source.local/k/sources/linux-3.2.29.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAABAgAGBQJQUBu6AAoJEDjbvchgkmk+Pp4P/2Tx9jVVr9oWcRgnYXW5WV42
-cdIKE79w7+R4Hh3PyFDzJb+1ph/CjJEW1ocfk87kkEuCHazAVALUKgOB7jJ039KI
-0cCbvkrY0f5TOqB5/utHQRQiO89DlY2NmdKX8ysValvRoEhBu6pgwEneDxM7QCkg
-NTtwLk73tl/duh8mk+X71FMlTXZLlb6ExV6ENHCbHbH9QgQzWIn/55sMVjppWzUt
-4t8BNj5IM/WJfIRAfh22V6urx5Iy0x62gzdvY7GeaDtmIbh/VAMU4kD22zgYksHR
-KB58alwlNlT8VlPVuXTs/Lv3ylhXf0mwhEdK0WnC+Msd8BMxWQqDTypf8SnbdVuj
-+rIOQDSZ/1SKynDrU2IGeQiMyRTfX/XNAu/WF+bIP5394A0gewejCpjm/+CXNkUj
-zIZaxdA59wm//76nYYQu4BckQe9oXi9TjOYocddZDpZB1A/5WmETTmlrGP6xbuu3
-q0Bb3XEZrFxQtPMLZ84hfKzVNZpD0AwrgdmcuiADQ5dbdzy7wgpqoebAKeAY9l2u
-zrSjX6t6brLE0DBMfVfdCW8S13rLletrd5e7I62kVG3dSuXwNE8CkZaVnGJrbp+T
-V/agjqx1cQzTDn5wei3dcsPY669a1jn1KHJoY0qow+qNEfaAo6fGPPnTX86FCg0a
-HNosOTufXwJfXU9G0YcL
-=dVDz
------END PGP SIGNATURE-----
diff --git a/source.local/k/sources/patches/tegra/cleanup_patches.patch.xz b/source.local/k/sources/patches/tegra/cleanup_patches.patch.xz
deleted file mode 100644
index 3cbea89..0000000
--- a/source.local/k/sources/patches/tegra/cleanup_patches.patch.xz
+++ /dev/null
diff --git a/source.local/kde/KDE.SlackBuild b/source.local/kde/KDE.SlackBuild
new file mode 100755
index 0000000..5af89d4
--- /dev/null
+++ b/source.local/kde/KDE.SlackBuild
@@ -0,0 +1,530 @@
+#!/bin/sh
+# Copyright 2011, 2012  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.
+
+# Adapted by Eric Hameleers <alien@slackware.com> from the modular x.org build.
+
+# To build only a single package group, specify it as $1, like:
+#   ./KDE.SlackBuild kdeedu
+# To build only a single package, specify both the group name
+# and the name of the package, like:
+#   ./KDE.SlackBuild kdeedu:marble
+#   ./KDE.SlackBuild kdebindings:perlqt,perlkde
+
+
+CLEANUP=${CLEANUP:-"yes"} # clean up build directory after successful build.
+PRECHECK=${PRECHECK:-"no"} # don't let the script check the available sources.
+CHECKOUT=${CHECKOUT:-"no"} # don't let the script checkout missing sources.
+
+KDEGITURI="git://anongit.kde.org"
+
+pkgbase() {
+  PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
+  case $PKGEXT in
+  'gz' )
+    PKGRETURN=$(basename $1 .tar.gz)
+    ;;
+  'bz2' )
+    PKGRETURN=$(basename $1 .tar.bz2)
+    ;;
+  'lzma' )
+    PKGRETURN=$(basename $1 .tar.lzma)
+    ;;
+  'xz' )
+    PKGRETURN=$(basename $1 .tar.xz)
+    ;;
+  *)
+    PKGRETURN=$(basename $1)
+    ;;
+  esac
+  echo $PKGRETURN
+}
+
+# Set initial variables:
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+# Set up a few useful functions:
+
+fix_perms() {
+  target_dir=$1
+  [ -z "$target_dir" ] && target_dir='.'
+
+  chown -R root:root $target_dir
+  find $target_dir \
+   \( -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 {} \;
+}
+
+strip_binaries() {
+  target_dir=$1
+  [ -z "$target_dir" ] && target_dir='.'
+
+  find $target_dir | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find $target_dir | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find $target_dir | xargs file | grep "current ar archive" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null
+}
+
+process_man_pages() {
+  # Compress and if needed symlink the man pages:
+  if [ -d usr/man ]; then
+    ( cd usr/man
+      for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.*
+      )
+      done
+    )
+  fi
+}
+
+process_info_pages() {
+  # Compress info pages and purge "dir" file from the package:
+  if [ -d usr/info ]; then
+    ( cd usr/info
+      rm -f dir
+      gzip -9 *
+    )
+  fi
+}
+
+no_usr_share_doc() {
+  # If there are docs, move them:
+  if [ -d usr/share/doc ]; then
+    mkdir -p usr/doc
+    mv usr/share/doc/* usr/doc
+    rmdir usr/share/doc
+  fi
+}
+
+precheck() {
+  # See if the sources we have match the module components we want to build:
+  RETVAL=0
+
+  for SRCFILE in $(find $CWD/src -name "*.tar.?z*") ; do
+    if cat modules/* |grep "^ *#" |grep -wq $(echo $(basename $SRCFILE) | rev | cut -f2- -d- | rev)$ ; then
+      echo "Source file '$(basename $SRCFILE)' is commented out in 'modules' !"
+    elif ! cat modules/* |grep -v "^ *#" |grep -wq $(echo $(basename $SRCFILE) | rev | cut -f2- -d- | rev) ; then
+      echo "Source file '$(basename $SRCFILE)' is not mentioned in 'modules' !"
+      RETVAL=1
+    fi
+  done
+
+  for MODULE in $(cat $CWD/modules/* | grep -v "^#") ; do
+    #if [ -z "$(find $CWD/src -name ${MODULE}-*)" ] ; then
+    if [ -z "$(find $CWD/src -name $MODULE-*.tar.* |grep -E "$MODULE-[^-]+.tar.*$|$MODULE-[0-9].+.tar.*$")" ] ; then
+      echo "Module '$MODULE' does not have a matching source tarball !"
+      if [ "$CHECKOUT" = "yes" -o "$CHECKOUT" = "YES" ]; then
+        echo "Checking out KDE component at branch '$VERSION'."
+        git archive --format=tar --prefix {$MODULE}-${VERSION}/ --remote ${KDEGITURI}/${MODULE}.git v${VERSION} | xz -c > $CWD/src/${MODULE}-${VERSION}.tar.xz
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+          echo "Error while checking out '$MODULE' !"
+          mv $CWD/src/${MODULE}-${VERSION}.tar.xz $CWD/src/${MODULE}-${VERSION}.tar.xz.failed
+        fi
+      else
+        RETVAL=1
+      fi
+    fi
+    # A missing slack-desc counts as fatal even if the program may end up
+    # inside the big meta-package.
+    if [ -z "$(find $CWD/slack-desc -name ${MODULE})" ] ; then
+      echo "Module '$MODULE' does not have a slack-desc file !"
+      RETVAL=1
+    fi
+  done
+
+  if [ $RETVAL -eq 0 ]; then
+    echo "Check complete, build starts in 5 seconds"
+    sleep 5
+  else
+    exit 1
+  fi
+}
+
+# Support function builds one complete module (like 'kdelibs'), or
+# exactly one package which is part of a module (like 'okular'):
+build_mod_pkg () {
+  kde_module=$1
+  kde_pkg=$2
+
+  cd $CWD/modules
+
+  # See if $kde_module is a module name like "kdeadmin":
+  if [ ! -z "$kde_module" ]; then
+    if [ ! -f "$kde_module" ]; then
+      return
+    fi
+  fi
+  PKG=${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}
+  rm -rf $PKG
+  mkdir -p $PKG
+  ( for PKGNAME in $(cat $kde_module |grep -v "^$" |grep -v "^#") ; do
+      # Find the full source filename - yeah ugly, but I had two goals:
+      # 1- source tarball can be in a random subdirectory of src/
+      # 2- differentiate between e.g. 'kdepim' and 'kdepim-runtime'
+      kde_src=$(basename $(find $CWD/src -name "$PKGNAME-*.tar.?z*" |grep -E "$PKGNAME-[^-]+.tar.*$|$PKGNAME-[0-9].+.tar.*$") 2>/dev/null)
+      if [ "x$kde_src" = "x" ]; then
+        echo "** Did not find '$PKGNAME' in src"
+        continue
+      fi
+      # Reset $PKGARCH to its initial value:
+      PKGARCH=$ARCH
+      # Perhaps $PKGARCH should be something different:
+      if grep -wq "^$PKGNAME" ${CWD}/noarch ; then
+        PKGARCH=noarch
+      fi 
+      if grep -wq "^$PKGNAME" ${CWD}/package-blacklist ; then
+        continue
+      fi
+      cd $SLACK_KDE_BUILD_DIR/${kde_module}
+      # If $kde_pkg is set, we only want to build one package:
+      if [ ! -z "$kde_pkg" ]; then
+        if [ "$kde_pkg" = "$PKGNAME" ]; then
+          # Set $PKG to a private dir for the modular package build:
+          PKG=$SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME
+          rm -rf $PKG
+          mkdir -p $PKG
+        else
+          continue
+        fi
+      else
+        echo
+        echo "Building from source ${kde_src}"
+        echo
+      fi
+      if grep -wq "^$PKGNAME" ${CWD}/modularize ; then
+        # Set $PKG to a private dir for the modular package build:
+        PKG=$SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME
+        rm -rf $PKG
+        mkdir -p $PKG
+      fi
+
+      # Let's figure out the version number on the modular package:
+      MODULAR_PACKAGE_VERSION=$(echo $kde_src | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+
+      rm -rf $(pkgbase $kde_src)
+      tar xf $(find $CWD/src -name ${kde_src}) || exit 1
+      cd $(pkgbase $kde_src) || exit 1
+
+      fix_perms
+
+      # If any patches are needed, call this script to apply them:
+      if [ -r $CWD/patch/${PKGNAME}.patch ]; then
+        . $CWD/patch/${PKGNAME}.patch || exit 1
+      fi
+
+      # If there's any pre-install things to do, do them:
+      if [ -r $CWD/pre-install/${PKGNAME}.pre-install ]; then
+        . $CWD/pre-install/${PKGNAME}.pre-install
+      fi
+
+      # Run cmake, using custom cmake script if needed:
+      if [ -r $CWD/cmake/${PKGNAME} ]; then
+        . $CWD/cmake/${PKGNAME}
+      elif [ -r $CWD/cmake/${kde_module} ]; then
+        . $CWD/cmake/${kde_module}
+      else
+        # This is the default configure script:
+        . $CWD/cmake/cmake
+      fi
+
+      make $NUMJOBS || make || exit 1
+      make install DESTDIR=$PKG || exit 1
+
+      # Back to source toplevel builddir, since cmake may have run in a subdir:
+      cd $SLACK_KDE_BUILD_DIR/${kde_module}/$(pkgbase $kde_src)
+
+      mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+      # Use specific documentation files if available, else use a default set:
+      if [ -r $CWD/docs/${PKGNAME} ]; then
+        cp -a $(cat $CWD/docs/${PKGNAME}) \
+          $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+      else
+        cp -a \
+          AUTHORS* CONTRIBUTING* COPYING* HACKING* \
+          INSTALL* MAINTAINERS README* NEWS* TODO* \
+          $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_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/${PKGNAME}-$MODULAR_PACKAGE_VERSION)
+            cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+            touch -r ChangeLog $DOCSDIR/ChangeLog
+          fi
+      fi
+
+      # Get rid of zero-length junk files:
+      find $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION -type f -size 0 -exec rm --verbose "{}" \;
+      rmdir --verbose $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION 2> /dev/null
+
+      # Strip binaries:
+      strip_binaries $PKG
+
+      # If there's any special post-install things to do, do them:
+      if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then
+        . $CWD/post-install/${PKGNAME}.post-install
+      fi
+
+      # If this package requires some doinst.sh material, add it here:
+      if [ -r $CWD/doinst.sh/${PKGNAME} ]; then
+        mkdir -p $PKG/install
+        cat $CWD/doinst.sh/${PKGNAME} \
+          | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
+          >> $PKG/install/doinst.sh
+      fi
+
+      # If this is a modular package, build it here:
+      if [ -d $SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME ]; then
+        cd $PKG
+        process_man_pages
+        process_info_pages
+        no_usr_share_doc          
+        mkdir -p $PKG/install
+        if [ -r $CWD/slack-desc/${PKGNAME} ]; then
+          cat $CWD/slack-desc/${PKGNAME} > $PKG/install/slack-desc
+        else
+          touch $PKG/install/slack-desc-missing
+        fi
+        if [ -r $CWD/build/${PKGNAME} ]; then
+          MODBUILD=$(cat $CWD/build/${PKGNAME})
+        else
+          MODBUILD=$BUILD
+        fi
+        if [ -r $CWD/makepkg/${PKGNAME} ]; then
+          BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
+        else
+          /sbin/makepkg -l y -c n ${SLACK_KDE_BUILD_DIR}/${kde_module}/${PKGNAME}-$(echo $MODULAR_PACKAGE_VERSION |tr - _)-${PKGARCH}-${MODBUILD}.txz
+        fi
+        # We will continue with the fresh packages installed:
+        upgradepkg --install-new --reinstall ${SLACK_KDE_BUILD_DIR}/${kde_module}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz
+        # Keep MIME database current:
+        /usr/bin/update-mime-database /usr/share/mime 1>/dev/null 2>/dev/null &
+      fi
+
+      # Reset $PKG to assume we're building the whole source dir:
+      PKG=${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}
+
+    done
+
+    # At this point, we have left the loop to build modular packages.
+    # We might need to build a package for the "<kde_module>", but to
+    # avoid needlessly repacking if there happens to be a package with
+    # the same name as "<kde_module>", we'll do some checks first.
+
+    # If every package listed in modules/"<kde_module>" is also listed
+    # in the modularize file, then there's no need to make a package
+    # for "<kde_module>":
+    echo
+    echo "Searching for packages in ${kde_module} that were not built modular:"
+    cat $CWD/modules/${kde_module} | grep -v "^#" | grep -v -w "^" | while read checkpackage ; do
+      if ! grep -wq "^$checkpackage" ${CWD}/modularize ; then
+        # Non-modular package found, so we'll have to build the package below.
+        # It might already have been built once, but in that case it is likely
+        # that more things have been added to the package directory since then.
+        echo "Found non-modular package $checkpackage."
+        exit 99
+      fi
+    done
+
+    # Exit if everything in "<kde_module>" was built modular:
+    if [ ! $? = 99 ]; then
+      echo "No non-modular components found in ${kde_module}."
+      echo "Not building catch-all package for ${kde_module}."
+      echo
+      return
+    fi
+
+    # If there's no /usr directory in the "<kde_module>" package directory,
+    # then skip it.  There's nothing present worth packing up.
+    if [ ! -d ${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}/usr ]; then
+      echo "No /usr directory found in package-${kde_module}."
+      echo "Not building catch-all package for ${kde_module}."
+      echo
+      return
+    fi
+
+    # Build a "<kde_module>" package for anything that wasn't built modular:
+    # It's safer to consider these to have binaries in them. ;-)
+
+    # Put up a bit of a black-box warning, in case this was a mistake where
+    # something was meant to be listed in the modularize file and wasn't:
+    echo
+    echo "**************************************************************************"
+    echo "* Building combined package for non-modular parts of ${kde_module}"
+    echo "**************************************************************************"
+    echo
+
+    PKGARCH=$ARCH
+    cd $PKG
+
+    process_man_pages
+    process_info_pages
+    no_usr_share_doc
+
+    # If there are post-install things to do for the combined package,
+    # we do them here.  This could be used for things like making a
+    # VERSION number for a combined package.  :-)
+    if [ -r $CWD/post-install/${kde_module}.post-install ]; then
+      . $CWD/post-install/${kde_module}.post-install
+    fi
+    mkdir -p $PKG/install
+    if [ -r $CWD/slack-desc/${kde_module} ]; then
+      cat $CWD/slack-desc/${kde_module} > $PKG/install/slack-desc
+    else
+      touch $PKG/install/slack-desc-missing
+    fi
+    if [ -r $CWD/doinst.sh/${kde_module} ]; then
+      cat $CWD/doinst.sh/${kde_module} \
+        | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
+        >> $PKG/install/doinst.sh
+    fi
+    if [ -r $CWD/build/${kde_module} ]; then
+      SRCDIRBUILD=$(cat $CWD/build/${kde_module})
+    else
+      SRCDIRBUILD=$BUILD
+    fi
+    if [ -r $CWD/makepkg/${kde_module} ]; then
+      BUILD=$SRCDIRBUILD . $CWD/makepkg/${kde_module}
+    else
+      /sbin/makepkg -l y -c n ${SLACK_KDE_BUILD_DIR}/${kde_module}/${kde_module}-$(echo $VERSION |tr - _)-${PKGARCH}-${SRCDIRBUILD}.txz
+    fi
+    # We will continue with the fresh packages installed:
+    upgradepkg --install-new --reinstall ${SLACK_KDE_BUILD_DIR}/${kde_module}/${kde_module}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
+    # Keep MIME database current:
+    /usr/bin/update-mime-database /usr/share/mime 1>/dev/null 2>/dev/null &
+  )
+}
+
+# Process the module queue. Format is:
+# module[:subpackage[,subpackage]] [module...]
+deterministic_build() {
+  RET=0
+  for ENTRY in $1 ; do
+    KDE_MOD=$(echo "$ENTRY": | cut -f1 -d:)
+    KDE_PKGS=$(echo "$ENTRY": | cut -f2 -d:)
+    if [ -z "$KDE_PKGS" ]; then
+      build_mod_pkg $KDE_MOD
+      let RET=$RET+$?
+    else
+      for KDE_PKG in $(echo $KDE_PKGS |tr ',' ' ') ; do
+        build_mod_pkg $KDE_MOD $KDE_PKG
+        let RET=$RET+$?
+      done
+    fi
+  done
+
+  return $RET
+}
+
+# MAIN PART #
+
+# Import the build configuration options for as far as they are not already set:
+[ -r ./KDE.options ] && . ./KDE.options
+
+# This avoids compiling a version number into KDE's .la files:
+QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR
+
+# Get the kde environment variables
+[ -d post-install/kdebase ] && eval $(sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" ./post-install/kdebase/profile.d/kde.sh)
+
+# Where we are going to do all the hard labour:
+SLACK_KDE_BUILD_DIR=$TMP/kde-build
+mkdir -p $SLACK_KDE_BUILD_DIR
+
+# Yes, we know kde-workspace is built twice.  kdebase needs the
+#   plasma bits from it, and then we build it again for good measure...
+# Same goes for kdelibs (at least during KDE 4.8.x) kdeutils:ksecrets needs
+#   kdelibs and then kdelibs needs a rebuild to pick up ksecretservice
+#   (this will no longer be required in KDE 4.9).
+# And kde-baseapps is rebuilt after kdewebdev because it can then pickup
+#   libtidy and enable the Konqueror validators plugin to validate HTML.
+KDEMODS=" \
+  kdelibs \
+  kdebase:nepomuk-core \
+  kdepimlibs \
+  kdebase \
+  kdesdk \
+  kdegraphics \
+  kdebindings \
+  kdebase:kde-workspace \
+  kdeaccessibility \
+  kdeutils \
+  kdelibs \
+  kdemultimedia \
+  extragear:libktorrent \
+  kdenetwork \
+  oxygen-icons \
+  kdeadmin \
+  kdeartwork \
+  kdegames \
+  kdetoys \
+  kdepim \
+  kdepim-runtime \
+  kdeedu \
+  kdewebdev \
+  kdebase:kde-baseapps \
+  kdeplasma-addons \
+  polkit-kde \
+  extragear \
+  "
+
+# Allow for specification of individual packages to be built:
+if [ -z "$1" ]; then
+  MODQUEUE=$KDEMODS
+else
+  MODQUEUE="$*"
+fi
+
+# If requested, check if
+# sources, module definitions and slack-desc are complete and matching:
+if [ "$PRECHECK" = "yes" -o "$PRECHECK" = "YES" ]; then
+  precheck
+fi
+
+# And finally, start working!
+for module in \
+  $MODQUEUE ;
+do
+  echo "SlackBuild processing module '$module'"
+  deterministic_build $module
+  if [ $? = 0 ]; then
+    # Move the created packages up into the KDE build directory:
+    mv ${SLACK_KDE_BUILD_DIR}/$(echo $module |cut -f1 -d:)/*.t?z ${SLACK_KDE_BUILD_DIR}/
+    if [ "$CLEANUP" = "yes" -o "$CLEANUP" = "YES" ]; then
+      # Clean out package and build directories:
+      rm -rf ${SLACK_KDE_BUILD_DIR}/$(echo $module |cut -f1 -d:)
+    fi
+  else
+    echo "${module} failed to build."
+    exit 1
+  fi
+  cd - ;
+done
+
+exit 0
+
+
diff --git a/source.local/kde/KDE.options b/source.local/kde/KDE.options
new file mode 100644
index 0000000..02e907a
--- /dev/null
+++ b/source.local/kde/KDE.options
@@ -0,0 +1,67 @@
+# Set default version/arch/build.  You can override these settings
+# in the SlackBuild scripts for each package (koffice, for example,
+# usually has a different version number), or by setting your own
+# environment variables.
+
+[ -z $VERSION ] && export VERSION=4.10.2
+[ -z $BUILD ] && export BUILD=1
+
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Use this as CFLAGS and CXXFLAGS:
+  if [ -z "$SLKCFLAGS" ]; then
+    if [ "$ARCH" = "i486" ]; then
+      export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+      export LIBDIRSUFFIX=""
+    elif [ "$ARCH" = "s390" ]; then
+      export SLKCFLAGS="-O2"
+      export LIBDIRSUFFIX=""
+    elif [ "$ARCH" = "x86_64" ]; then
+      export SLKCFLAGS="-O2 -fPIC"
+      export LIBDIRSUFFIX="64"
+    elif [ "$ARCH" = "arm" ]; then
+      export SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+      export LIBDIRSUFFIX=""
+    elif [ "$ARCH" = "armel" ]; then
+      export SLKCFLAGS="-O2 -march=armv4t"
+      export LIBDIRSUFFIX=""
+    elif [ "$ARCH" = "armv7hl" ]; then
+      export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+      export LIBDIRSUFFIX=""
+    else
+      export SLKCFLAGS="-O2"
+      export LIBDIRSUFFIX=""
+    fi
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+[ -z $PKGARCH ] && export PKGARCH=$ARCH
+
+# Use this to set the number of parallel make jobs:
+if [ -z "$NUMJOBS" ]; then
+  export NUMJOBS="-j7"
+fi
+
+# Additional cmake flags that are spanned across the KDE modules
+# Do not use "final build" unless we build an actual release.
+#export KDE_OPT_ARGS=" -DKDE4_ENABLE_FINAL=\"ON\"  -DSITE=\"slackware.com\" "
+export KDE_OPT_ARGS=" -DKDE4_BUILD_TESTS=OFF -DSITE=\"slackware.com\" -DKDE_DISTRIBUTION_TEXT=\"volkerdi@slackware.com\" "
+
diff --git a/source.local/kde/build/increment.sh b/source.local/kde/build/increment.sh
new file mode 100755
index 0000000..6de5d0d
--- /dev/null
+++ b/source.local/kde/build/increment.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# A script to increment build numbers.
+# Call it with the list of the build numbers to increase by one:
+#
+# ./increment.sh xf86-input-acecad xf86-input-aiptek xf86-input-joystick
+#
+# If a build file does not exist, it will be created with a value of 2.
+
+for build in $* ; do
+  if [ ! -r $build ]; then
+    echo "Creating $build with value 2"
+    echo 2 > $build
+  else
+    echo "Incrementing $build $(cat $build) -> $(expr $(cat $build) + 1)"
+    echo $(expr $(cat $build) + 1) > $build
+  fi
+done
diff --git a/source.local/kde/cmake/amarok b/source.local/kde/cmake/amarok
new file mode 100644
index 0000000..9cf5a28
--- /dev/null
+++ b/source.local/kde/cmake/amarok
@@ -0,0 +1,22 @@
+# NOTE: if cmake complains that it can not find qscript-qt when in fact you
+# have it installed, this is likely because you are building inside a chroot.
+# To remedy the error, run the command "dbus-uuidgen --ensure"
+# and then re-start this SlackBuild :
+
+export QTSCRIPTS=/usr/lib${LIBDIRSUFFIX}/qt4/plugins/script
+
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/cmake/analitza b/source.local/kde/cmake/analitza
new file mode 100644
index 0000000..cf539f4
--- /dev/null
+++ b/source.local/kde/cmake/analitza
@@ -0,0 +1,18 @@
+mkdir build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_EXE_LINKER_FLAGS:STRING="-ltermcap" \
+    -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="-ltermcap" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/cmake/bluedevil b/source.local/kde/cmake/bluedevil
new file mode 100644
index 0000000..d855f53
--- /dev/null
+++ b/source.local/kde/cmake/bluedevil
@@ -0,0 +1,13 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_tests:BOOL=OFF \
+    ..
+
diff --git a/source.local/kde/cmake/calligra b/source.local/kde/cmake/calligra
new file mode 100644
index 0000000..adb281f
--- /dev/null
+++ b/source.local/kde/cmake/calligra
@@ -0,0 +1,17 @@
+mkdir build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DIHAVEPATCHEDQT:BOOL=ON \
+    ..
+
diff --git a/source.local/kde/cmake/cmake b/source.local/kde/cmake/cmake
new file mode 100644
index 0000000..263c12c
--- /dev/null
+++ b/source.local/kde/cmake/cmake
@@ -0,0 +1,16 @@
+mkdir build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/cmake/k3b b/source.local/kde/cmake/k3b
new file mode 100644
index 0000000..75a29ec
--- /dev/null
+++ b/source.local/kde/cmake/k3b
@@ -0,0 +1,17 @@
+mkdir build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DK3B_ENABLE_HAL_SUPPORT:BOOL=OFF \
+    -DKDE4_ENABLE_HTMLHANDBOOK:BOOL=ON \
+    ..
+
diff --git a/source.local/kde/cmake/kdeaccessibility b/source.local/kde/cmake/kdeaccessibility
new file mode 100644
index 0000000..3fc784c
--- /dev/null
+++ b/source.local/kde/cmake/kdeaccessibility
@@ -0,0 +1,17 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_jovie:BOOL=OFF \
+    -DWITH_Speechd:BOOL=OFF \
+    ..
+
diff --git a/source.local/kde/cmake/kdeadmin b/source.local/kde/cmake/kdeadmin
new file mode 100644
index 0000000..863974d
--- /dev/null
+++ b/source.local/kde/cmake/kdeadmin
@@ -0,0 +1,18 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DKU_FIRSTGID=1000 \
+    -DKU_FIRSTUID=1000 \
+    --with-shadow \
+    ..
+
diff --git a/source.local/kde/cmake/kdeartwork b/source.local/kde/cmake/kdeartwork
new file mode 100644
index 0000000..4f394d4
--- /dev/null
+++ b/source.local/kde/cmake/kdeartwork
@@ -0,0 +1,16 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DKSCREENSAVER_SOUND_SUPPORT=ON \
+    ..
+
diff --git a/source.local/kde/cmake/kdebase b/source.local/kde/cmake/kdebase
new file mode 100644
index 0000000..c1835c3
--- /dev/null
+++ b/source.local/kde/cmake/kdebase
@@ -0,0 +1,16 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DRUN_KAPPFINDER=ON \
+    ..
+
diff --git a/source.local/kde/cmake/kdebindings b/source.local/kde/cmake/kdebindings
new file mode 100644
index 0000000..086f962
--- /dev/null
+++ b/source.local/kde/cmake/kdebindings
@@ -0,0 +1,31 @@
+# Set 'vendorarch' (install location for vendor shipped
+# architecture dependent perl modules):
+eval $(perl '-V:vendorarch')
+
+# Likewise for Ruby (note that our "vendordir" is empty, so we use sitedir):
+ruby_vendorlibdir=$(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+ruby_vendorarchdir=$(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
+
+mkdir -p build
+cd build
+    #-DCMAKE_BACKWARDS_COMPATIBILITY:STRING="2.2" \
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCUSTOM_PERL_SITE_ARCH_DIR=${vendorarch} \
+    -DRUBY_VENDORARCH_DIR:PATH=${ruby_vendorarchdir} \
+    -DRUBY_VENDORLIB_DIR:PATH=${ruby_vendorlibdir} \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DENABLE_QYOTO:BOOL=OFF \
+    -DENABLE_QSCINTILLA_SHARP:BOOL=OFF \
+    -DENABLE_KIMONO:BOOL=OFF \
+    -DBUILD_csharp:BOOL=OFF \
+    ..
+
diff --git a/source.local/kde/cmake/kdelibs b/source.local/kde/cmake/kdelibs
new file mode 100644
index 0000000..92015a9
--- /dev/null
+++ b/source.local/kde/cmake/kdelibs
@@ -0,0 +1,17 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DWITH_HAL=OFF \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DKDE_DISTRIBUTION_TEXT="volkerdi@slackware.com" \
+    ..
+
diff --git a/source.local/kde/cmake/kdenetwork b/source.local/kde/cmake/kdenetwork
new file mode 100644
index 0000000..eeb6206
--- /dev/null
+++ b/source.local/kde/cmake/kdenetwork
@@ -0,0 +1,16 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DWITH_irc=ON \
+    ..
+
diff --git a/source.local/kde/cmake/kdewebdev b/source.local/kde/cmake/kdewebdev
new file mode 100644
index 0000000..1e309b8
--- /dev/null
+++ b/source.local/kde/cmake/kdewebdev
@@ -0,0 +1,17 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DLIBTIDY_INCLUDE_DIR=$PKG/usr/include \
+    -DLIBTIDY_LIBRARIES=$PKG/usr/lib${LIBDIRSUFFIX}/libtidy.so \
+    ..
+
diff --git a/source.local/kde/cmake/kross-interpreters b/source.local/kde/cmake/kross-interpreters
new file mode 100644
index 0000000..b57de3f
--- /dev/null
+++ b/source.local/kde/cmake/kross-interpreters
@@ -0,0 +1,17 @@
+mkdir -p build
+cd build
+    #-DCMAKE_BACKWARDS_COMPATIBILITY:STRING="2.2" \
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_ruby:BOOL=OFF \
+    ..
+
diff --git a/source.local/kde/cmake/kwebkitpart b/source.local/kde/cmake/kwebkitpart
new file mode 100644
index 0000000..ca8ac5d
--- /dev/null
+++ b/source.local/kde/cmake/kwebkitpart
@@ -0,0 +1,11 @@
+mkdir -p build
+cd build
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
+  PATH=$QTDIR/bin:$PATH \
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/cmake/networkmanagement b/source.local/kde/cmake/networkmanagement
new file mode 100644
index 0000000..81964f4
--- /dev/null
+++ b/source.local/kde/cmake/networkmanagement
@@ -0,0 +1,17 @@
+mkdir build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/cmake/perlkde b/source.local/kde/cmake/perlkde
new file mode 100644
index 0000000..670c028
--- /dev/null
+++ b/source.local/kde/cmake/perlkde
@@ -0,0 +1,20 @@
+# Set 'vendorarch' (install location for vendor shipped
+# architecture dependent perl modules):
+eval $(perl '-V:vendorarch')
+
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCUSTOM_PERL_SITE_ARCH_DIR=$vendorarch \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/cmake/perlqt b/source.local/kde/cmake/perlqt
new file mode 100644
index 0000000..670c028
--- /dev/null
+++ b/source.local/kde/cmake/perlqt
@@ -0,0 +1,20 @@
+# Set 'vendorarch' (install location for vendor shipped
+# architecture dependent perl modules):
+eval $(perl '-V:vendorarch')
+
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCUSTOM_PERL_SITE_ARCH_DIR=$vendorarch \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/cmake/polkit-kde-agent-1 b/source.local/kde/cmake/polkit-kde-agent-1
new file mode 100644
index 0000000..7c98736
--- /dev/null
+++ b/source.local/kde/cmake/polkit-kde-agent-1
@@ -0,0 +1,15 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/cmake/polkit-kde-kcmodules-1 b/source.local/kde/cmake/polkit-kde-kcmodules-1
new file mode 100644
index 0000000..7c98736
--- /dev/null
+++ b/source.local/kde/cmake/polkit-kde-kcmodules-1
@@ -0,0 +1,15 @@
+mkdir -p build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source.local/kde/docs/k3b b/source.local/kde/docs/k3b
new file mode 100644
index 0000000..b12b943
--- /dev/null
+++ b/source.local/kde/docs/k3b
@@ -0,0 +1 @@
+COPYING* ChangeLog FAQ.txt INSTALL.txt PERMISSIONS.txt README.txt Release\ How\ To.txt
diff --git a/source.local/kde/docs/kdepimlibs b/source.local/kde/docs/kdepimlibs
new file mode 100644
index 0000000..88e3194
--- /dev/null
+++ b/source.local/kde/docs/kdepimlibs
@@ -0,0 +1,2 @@
+COPYING* DEBUG HACKING MAINTAINERS PLAN POLICIES README*
+
diff --git a/source.local/kde/doinst.sh/amarok b/source.local/kde/doinst.sh/amarok
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/amarok
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/blinken b/source.local/kde/doinst.sh/blinken
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/blinken
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/bluedevil b/source.local/kde/doinst.sh/bluedevil
new file mode 100644
index 0000000..85ff4d8
--- /dev/null
+++ b/source.local/kde/doinst.sh/bluedevil
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
diff --git a/source.local/kde/doinst.sh/cantor b/source.local/kde/doinst.sh/cantor
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/cantor
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/gwenview b/source.local/kde/doinst.sh/gwenview
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/gwenview
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/jovie b/source.local/kde/doinst.sh/jovie
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/jovie
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/k3b b/source.local/kde/doinst.sh/k3b
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/k3b
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kalgebra b/source.local/kde/doinst.sh/kalgebra
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kalgebra
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kalzium b/source.local/kde/doinst.sh/kalzium
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kalzium
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kamera b/source.local/kde/doinst.sh/kamera
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kamera
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kanagram b/source.local/kde/doinst.sh/kanagram
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kanagram
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kate b/source.local/kde/doinst.sh/kate
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kate
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kaudiocreator b/source.local/kde/doinst.sh/kaudiocreator
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kaudiocreator
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kbruch b/source.local/kde/doinst.sh/kbruch
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kbruch
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kcalc b/source.local/kde/doinst.sh/kcalc
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kcalc
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kcolorchooser b/source.local/kde/doinst.sh/kcolorchooser
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kcolorchooser
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kde-applications b/source.local/kde/doinst.sh/kde-applications
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kde-applications
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kde-baseapps b/source.local/kde/doinst.sh/kde-baseapps
new file mode 100644
index 0000000..85ff4d8
--- /dev/null
+++ b/source.local/kde/doinst.sh/kde-baseapps
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
diff --git a/source.local/kde/doinst.sh/kde-runtime b/source.local/kde/doinst.sh/kde-runtime
new file mode 100644
index 0000000..22d4849
--- /dev/null
+++ b/source.local/kde/doinst.sh/kde-runtime
@@ -0,0 +1,5 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kde-workspace b/source.local/kde/doinst.sh/kde-workspace
new file mode 100644
index 0000000..793bae7
--- /dev/null
+++ b/source.local/kde/doinst.sh/kde-workspace
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+config() {
+  NEW="$1"
+  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
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/kde/kdm/backgroundrc.new
+config etc/kde/kdm/kdmrc.new
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x usr/bin/update-mime-database ]; then
+  usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdeaccessibility b/source.local/kde/doinst.sh/kdeaccessibility
new file mode 100644
index 0000000..22d4849
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdeaccessibility
@@ -0,0 +1,5 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdeadmin b/source.local/kde/doinst.sh/kdeadmin
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdeadmin
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdeartwork b/source.local/kde/doinst.sh/kdeartwork
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdeartwork
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdebase b/source.local/kde/doinst.sh/kdebase
new file mode 100644
index 0000000..85ff4d8
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdebase
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
diff --git a/source.local/kde/doinst.sh/kdeedu b/source.local/kde/doinst.sh/kdeedu
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdeedu
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdegames b/source.local/kde/doinst.sh/kdegames
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdegames
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdegraphics b/source.local/kde/doinst.sh/kdegraphics
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdegraphics
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdelibs b/source.local/kde/doinst.sh/kdelibs
new file mode 100644
index 0000000..d7006c7
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdelibs
@@ -0,0 +1,9 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database /usr/share/mime >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdemultimedia b/source.local/kde/doinst.sh/kdemultimedia
new file mode 100644
index 0000000..22d4849
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdemultimedia
@@ -0,0 +1,5 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdenetwork b/source.local/kde/doinst.sh/kdenetwork
new file mode 100644
index 0000000..22d4849
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdenetwork
@@ -0,0 +1,5 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdepim b/source.local/kde/doinst.sh/kdepim
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdepim
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdepim-runtime b/source.local/kde/doinst.sh/kdepim-runtime
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdepim-runtime
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdeplasma-addons b/source.local/kde/doinst.sh/kdeplasma-addons
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdeplasma-addons
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdesdk b/source.local/kde/doinst.sh/kdesdk
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdesdk
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdetoys b/source.local/kde/doinst.sh/kdetoys
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdetoys
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdeutils b/source.local/kde/doinst.sh/kdeutils
new file mode 100644
index 0000000..22d4849
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdeutils
@@ -0,0 +1,5 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdevelop b/source.local/kde/doinst.sh/kdevelop
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdevelop
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdevplatform b/source.local/kde/doinst.sh/kdevplatform
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdevplatform
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdewebdev b/source.local/kde/doinst.sh/kdewebdev
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdewebdev
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kdf b/source.local/kde/doinst.sh/kdf
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kdf
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kgamma b/source.local/kde/doinst.sh/kgamma
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kgamma
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kgeography b/source.local/kde/doinst.sh/kgeography
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kgeography
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/khangman b/source.local/kde/doinst.sh/khangman
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/khangman
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kig b/source.local/kde/doinst.sh/kig
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kig
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kiten b/source.local/kde/doinst.sh/kiten
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kiten
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/klettres b/source.local/kde/doinst.sh/klettres
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/klettres
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kmag b/source.local/kde/doinst.sh/kmag
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kmag
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kmousetool b/source.local/kde/doinst.sh/kmousetool
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kmousetool
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kmouth b/source.local/kde/doinst.sh/kmouth
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kmouth
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kmplot b/source.local/kde/doinst.sh/kmplot
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kmplot
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/koffice b/source.local/kde/doinst.sh/koffice
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/koffice
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kolourpaint b/source.local/kde/doinst.sh/kolourpaint
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kolourpaint
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/konsole b/source.local/kde/doinst.sh/konsole
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/konsole
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kopete-cryptography b/source.local/kde/doinst.sh/kopete-cryptography
new file mode 100644
index 0000000..22d4849
--- /dev/null
+++ b/source.local/kde/doinst.sh/kopete-cryptography
@@ -0,0 +1,5 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kruler b/source.local/kde/doinst.sh/kruler
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kruler
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/ksaneplugin b/source.local/kde/doinst.sh/ksaneplugin
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/ksaneplugin
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/ksnapshot b/source.local/kde/doinst.sh/ksnapshot
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/ksnapshot
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kstars b/source.local/kde/doinst.sh/kstars
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kstars
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/ktorrent b/source.local/kde/doinst.sh/ktorrent
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/ktorrent
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/ktouch b/source.local/kde/doinst.sh/ktouch
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/ktouch
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kturtle b/source.local/kde/doinst.sh/kturtle
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kturtle
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/kwordquiz b/source.local/kde/doinst.sh/kwordquiz
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/kwordquiz
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/marble b/source.local/kde/doinst.sh/marble
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/marble
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/okular b/source.local/kde/doinst.sh/okular
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/okular
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/parley b/source.local/kde/doinst.sh/parley
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/parley
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/rocs b/source.local/kde/doinst.sh/rocs
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/rocs
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/skanlite b/source.local/kde/doinst.sh/skanlite
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/skanlite
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/step b/source.local/kde/doinst.sh/step
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/source.local/kde/doinst.sh/step
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/doinst.sh/wicd-kde b/source.local/kde/doinst.sh/wicd-kde
new file mode 100644
index 0000000..22d4849
--- /dev/null
+++ b/source.local/kde/doinst.sh/wicd-kde
@@ -0,0 +1,5 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source.local/kde/modularize b/source.local/kde/modularize
new file mode 100644
index 0000000..bb441ba
--- /dev/null
+++ b/source.local/kde/modularize
@@ -0,0 +1,227 @@
+# If a package is listed here, it will be built apart from the
+# usual "grab bag" package that's made from each source directory.
+#
+# Things to note:
+#
+# Listing a package here will not cause it to be built.  To do that,
+# make sure it is added to one of the files in the modules/ directory
+# that is built by the main KDE.SlackBuild script.
+#
+# If a subpackage name happens to be the same as the "grab bag" package
+# that contains it, you need to be a bit careful.  Unless everything
+# in that collection will be built modular, *do not* list that name
+# here!  If you do, first the module by that name will be built, and
+# then everything that's not modular in that collection will be built
+# into a "grab bag" that will replace that first package.
+#
+# If the goal is to build the most combined packages possible, the
+# easiest way to accomplish that is just to move this file out of the
+# way and replace it with an empty one before building.
+
+# kdeaccessibility
+jovie
+kaccessible
+kmouth
+kmousetool
+kmag
+
+# kdelibs:
+kdelibs
+
+# kdebase:
+nepomuk-core
+nepomuk-widgets
+kde-baseapps
+kactivities
+konsole
+kate
+kde-wallpapers
+kde-workspace
+kde-runtime
+kde-base-artwork
+
+# kdeedu:
+libkdeedu
+analitza
+blinken
+cantor
+kalgebra
+kalzium
+kanagram
+kbruch
+kgeography
+khangman
+kig
+kiten
+klettres
+kmplot
+kstars
+ktouch
+kturtle
+kwordquiz
+marble
+parley
+pairs
+rocs
+step
+
+# kdeadmin
+kdeadmin
+
+# kdeartwork
+kdeartwork
+
+# kdegraphics:
+libkipi
+libkexiv2
+libkdcraw
+libksane
+okular
+kdegraphics-mobipocket
+kdegraphics-strigi-analyzer
+kdegraphics-thumbnailers
+gwenview
+kamera
+kcolorchooser
+kgamma
+kolourpaint
+kruler
+ksaneplugin
+ksnapshot
+svgpart
+
+# kdebindings
+smokegen
+smokeqt
+qtruby
+perlqt
+smokekde
+korundum
+perlkde
+pykde4
+kross-interpreters
+kimono
+qyoto
+
+# kdemultimedia
+libkcddb
+libkcompactdisc
+audiocd-kio
+dragon
+ffmpegthumbs
+mplayerthumbs
+juk
+kmix
+kscd
+
+# kdenetwork
+kdenetwork
+
+# kdeutils
+ark
+filelight
+kcalc
+kcharselect
+kdf
+kfloppy
+kgpg
+#printer-applet
+print-manager
+kremotecontrol
+ktimer
+kwallet
+superkaramba
+sweeper
+
+# kdegames
+libkdegames
+libkmahjongg
+klickety
+ksudoku
+ksquares
+kpat
+klines
+ksnakeduel
+kollision
+kshisen
+kblocks
+lskat
+kreversi
+bovo
+kajongg
+granatier
+kmines
+kiriki
+kigo
+bomber
+kolf
+kdiamond
+kbounce
+konquest
+kapman
+knavalbattle
+killbots
+kubrick
+kgoldrunner
+knetwalk
+kbreakout
+ksirk
+kfourinline
+picmi
+kblackbox
+palapeli
+katomic
+ktuberling
+kjumpingcube
+kmahjongg
+kspaceduel
+
+# kdewebdev
+kdewebdev
+
+# kdepim
+kdepim
+kdepim-runtime
+
+# kdepimlibs
+kdepimlibs
+
+# kdeplasma-addons
+kdeplasma-addons
+
+# kdesdk
+kdesdk
+
+# kdetoys
+kdetoys
+
+# oxygen-icons
+oxygen-icons
+
+# polkit-kde
+polkit-kde-agent-1
+polkit-kde-kcmodules-1
+
+# extragear
+bluedevil
+k3b
+kaudiocreator
+kplayer
+kwebkitpart
+oxygen-gtk2
+oxygen-gtk3
+kdevplatform
+kdevelop-pg-qt
+kdevelop
+#kdevelop-php
+quanta
+wicd-kde
+networkmanagement
+skanlite
+kio-mtp
+libktorrent
+ktorrent
+amarok
+calligra
+libkscreen
+kscreen
diff --git a/source.local/kde/modules/extragear b/source.local/kde/modules/extragear
new file mode 100644
index 0000000..3c78fcc
--- /dev/null
+++ b/source.local/kde/modules/extragear
@@ -0,0 +1,22 @@
+bluedevil
+k3b
+kaudiocreator
+kplayer
+kwebkitpart
+oxygen-gtk2
+oxygen-gtk3
+kdevplatform
+kdevelop-pg-qt
+kdevelop
+#kdevelop-php
+quanta
+wicd-kde
+networkmanagement
+skanlite
+kio-mtp
+libktorrent
+ktorrent
+amarok
+calligra
+libkscreen
+kscreen
diff --git a/source.local/kde/modules/kdeaccessibility b/source.local/kde/modules/kdeaccessibility
new file mode 100644
index 0000000..c8cda11
--- /dev/null
+++ b/source.local/kde/modules/kdeaccessibility
@@ -0,0 +1,6 @@
+#kdeaccessibility
+#jovie
+kaccessible
+kmouth
+kmousetool
+kmag
diff --git a/source.local/kde/modules/kdeadmin b/source.local/kde/modules/kdeadmin
new file mode 100644
index 0000000..9408973
--- /dev/null
+++ b/source.local/kde/modules/kdeadmin
@@ -0,0 +1 @@
+kdeadmin
diff --git a/source.local/kde/modules/kdeartwork b/source.local/kde/modules/kdeartwork
new file mode 100644
index 0000000..e0f2432
--- /dev/null
+++ b/source.local/kde/modules/kdeartwork
@@ -0,0 +1 @@
+kdeartwork
diff --git a/source.local/kde/modules/kdebase b/source.local/kde/modules/kdebase
new file mode 100644
index 0000000..38337e3
--- /dev/null
+++ b/source.local/kde/modules/kdebase
@@ -0,0 +1,10 @@
+nepomuk-core
+nepomuk-widgets
+kde-baseapps
+kactivities
+konsole
+kate
+kde-wallpapers
+kde-workspace
+kde-runtime
+kde-base-artwork
diff --git a/source.local/kde/modules/kdebindings b/source.local/kde/modules/kdebindings
new file mode 100644
index 0000000..ab459d9
--- /dev/null
+++ b/source.local/kde/modules/kdebindings
@@ -0,0 +1,11 @@
+smokegen                                                                        
+smokeqt                                                                         
+qtruby                                                                          
+perlqt                                                                          
+smokekde
+korundum
+perlkde                                                                         
+pykde4
+kross-interpreters
+#kimono
+#qyoto
diff --git a/source.local/kde/modules/kdeedu b/source.local/kde/modules/kdeedu
new file mode 100644
index 0000000..c462759
--- /dev/null
+++ b/source.local/kde/modules/kdeedu
@@ -0,0 +1,23 @@
+libkdeedu
+analitza
+blinken
+cantor
+kalgebra
+kalzium
+kanagram
+kbruch
+kgeography
+khangman
+kig
+kiten
+klettres
+kmplot
+kstars
+ktouch
+kturtle
+kwordquiz
+marble
+parley
+pairs
+rocs
+step
diff --git a/source.local/kde/modules/kdegames b/source.local/kde/modules/kdegames
new file mode 100644
index 0000000..eb3133b
--- /dev/null
+++ b/source.local/kde/modules/kdegames
@@ -0,0 +1,41 @@
+libkdegames
+libkmahjongg
+klickety
+ksudoku
+ksquares
+kpat
+klines
+ksnakeduel
+kollision
+kshisen
+kblocks
+lskat
+kreversi
+bovo
+kajongg
+granatier
+kmines
+kiriki
+kigo
+bomber
+kolf
+kdiamond
+kbounce
+konquest
+kapman
+knavalbattle
+killbots
+kubrick
+kgoldrunner
+knetwalk
+kbreakout
+ksirk
+kfourinline
+picmi
+kblackbox
+palapeli
+katomic
+ktuberling
+kjumpingcube
+kmahjongg
+kspaceduel
diff --git a/source.local/kde/modules/kdegraphics b/source.local/kde/modules/kdegraphics
new file mode 100644
index 0000000..485b3a8
--- /dev/null
+++ b/source.local/kde/modules/kdegraphics
@@ -0,0 +1,17 @@
+libkipi
+libkexiv2
+libkdcraw
+libksane
+okular
+kdegraphics-mobipocket
+kdegraphics-strigi-analyzer
+kdegraphics-thumbnailers
+gwenview
+kamera
+kcolorchooser
+kgamma
+kolourpaint
+kruler
+ksaneplugin
+ksnapshot
+svgpart
diff --git a/source.local/kde/modules/kdelibs b/source.local/kde/modules/kdelibs
new file mode 100644
index 0000000..4731597
--- /dev/null
+++ b/source.local/kde/modules/kdelibs
@@ -0,0 +1 @@
+kdelibs
diff --git a/source.local/kde/modules/kdemultimedia b/source.local/kde/modules/kdemultimedia
new file mode 100644
index 0000000..a78827b
--- /dev/null
+++ b/source.local/kde/modules/kdemultimedia
@@ -0,0 +1,9 @@
+libkcddb
+libkcompactdisc
+audiocd-kio
+dragon
+#ffmpegthumbs
+mplayerthumbs
+juk
+kmix
+#kscd
diff --git a/source.local/kde/modules/kdenetwork b/source.local/kde/modules/kdenetwork
new file mode 100644
index 0000000..f8ad9ad
--- /dev/null
+++ b/source.local/kde/modules/kdenetwork
@@ -0,0 +1 @@
+kdenetwork
diff --git a/source.local/kde/modules/kdepim b/source.local/kde/modules/kdepim
new file mode 100644
index 0000000..6594afb
--- /dev/null
+++ b/source.local/kde/modules/kdepim
@@ -0,0 +1,2 @@
+kdepim
+kdepim-runtime
diff --git a/source.local/kde/modules/kdepimlibs b/source.local/kde/modules/kdepimlibs
new file mode 100644
index 0000000..d3deaeb
--- /dev/null
+++ b/source.local/kde/modules/kdepimlibs
@@ -0,0 +1 @@
+kdepimlibs
diff --git a/source.local/kde/modules/kdeplasma-addons b/source.local/kde/modules/kdeplasma-addons
new file mode 100644
index 0000000..cf9d5ea
--- /dev/null
+++ b/source.local/kde/modules/kdeplasma-addons
@@ -0,0 +1 @@
+kdeplasma-addons
diff --git a/source.local/kde/modules/kdesdk b/source.local/kde/modules/kdesdk
new file mode 100644
index 0000000..4565576
--- /dev/null
+++ b/source.local/kde/modules/kdesdk
@@ -0,0 +1 @@
+kdesdk
diff --git a/source.local/kde/modules/kdetoys b/source.local/kde/modules/kdetoys
new file mode 100644
index 0000000..87850d9
--- /dev/null
+++ b/source.local/kde/modules/kdetoys
@@ -0,0 +1 @@
+kdetoys
diff --git a/source.local/kde/modules/kdeutils b/source.local/kde/modules/kdeutils
new file mode 100644
index 0000000..eb6d1ef
--- /dev/null
+++ b/source.local/kde/modules/kdeutils
@@ -0,0 +1,15 @@
+#kdeutils
+ark
+filelight
+kcalc
+kcharselect
+kdf
+kfloppy
+kgpg
+#printer-applet
+print-manager
+kremotecontrol
+ktimer
+kwallet
+superkaramba
+sweeper
diff --git a/source.local/kde/modules/kdewebdev b/source.local/kde/modules/kdewebdev
new file mode 100644
index 0000000..2be324d
--- /dev/null
+++ b/source.local/kde/modules/kdewebdev
@@ -0,0 +1 @@
+kdewebdev
diff --git a/source.local/kde/modules/oxygen-icons b/source.local/kde/modules/oxygen-icons
new file mode 100644
index 0000000..8252519
--- /dev/null
+++ b/source.local/kde/modules/oxygen-icons
@@ -0,0 +1 @@
+oxygen-icons
diff --git a/source.local/kde/modules/polkit-kde b/source.local/kde/modules/polkit-kde
new file mode 100644
index 0000000..9c1e647
--- /dev/null
+++ b/source.local/kde/modules/polkit-kde
@@ -0,0 +1,2 @@
+polkit-kde-agent-1
+polkit-kde-kcmodules-1
diff --git a/source.local/kde/noarch b/source.local/kde/noarch
new file mode 100644
index 0000000..0c1318f
--- /dev/null
+++ b/source.local/kde/noarch
@@ -0,0 +1,5 @@
+# List packages with an $ARCH of "noarch" (i.e. packages
+# that contain no binaries) here:
+
+kde-wallpapers
+
diff --git a/source.local/kde/package-blacklist b/source.local/kde/package-blacklist
new file mode 100644
index 0000000..71e99c4
--- /dev/null
+++ b/source.local/kde/package-blacklist
@@ -0,0 +1,9 @@
+# Enter packages to skip (perhaps because they aren't used on
+# this platform) below.  Just the package name -- no version
+# number is needed.
+
+## kdebindings:
+# needs c-sharp:
+kimono
+qyoto
+
diff --git a/source.local/kde/patch/README b/source.local/kde/patch/README
new file mode 100644
index 0000000..2478e45
--- /dev/null
+++ b/source.local/kde/patch/README
@@ -0,0 +1,18 @@
+
+IMPORTANT!
+
+To fail/exit a script, use this:
+
+[command that fails] || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+DO NOT USE THIS:
+
+[command that fails] || exit 1
+
+as it will cause the parent script to exit in the wrong location and possibly
+silently skip building some packages.
+
+Thanks,
+
+The Management
+
diff --git a/source.local/kde/patch/kde-workspace.patch b/source.local/kde/patch/kde-workspace.patch
new file mode 100644
index 0000000..d86c11a
--- /dev/null
+++ b/source.local/kde/patch/kde-workspace.patch
@@ -0,0 +1,6 @@
+# Increase the timeout to accomodate slow-to-initialize video chipset drivers:
+zcat $CWD/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Always show 'remaining time' in the popup of the battery plasmoid:
+zcat $CWD/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/source.local/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz b/source.local/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz
new file mode 100644
index 0000000..7e16f14
--- /dev/null
+++ b/source.local/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz
diff --git a/source.local/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz b/source.local/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz
new file mode 100644
index 0000000..a9c2bae
--- /dev/null
+++ b/source.local/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz
diff --git a/source.local/kde/patch/kdelibs.patch b/source.local/kde/patch/kdelibs.patch
new file mode 100644
index 0000000..50ef577
--- /dev/null
+++ b/source.local/kde/patch/kdelibs.patch
@@ -0,0 +1,8 @@
+# Slackware ships a different version of XML DTDs:
+zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Make uPnP support depend on the environment variable SOLID_UPNP,
+# e.g. by creating an /etc/profile.d/upnp.sh file with the following contents:
+# export SOLID_UPNP=1
+zcat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/source.local/kde/patch/kdelibs/kdelibs.docbook.patch.gz b/source.local/kde/patch/kdelibs/kdelibs.docbook.patch.gz
new file mode 100644
index 0000000..2de9a66
--- /dev/null
+++ b/source.local/kde/patch/kdelibs/kdelibs.docbook.patch.gz
diff --git a/source.local/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz b/source.local/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz
new file mode 100644
index 0000000..479980f
--- /dev/null
+++ b/source.local/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz
diff --git a/source.local/kde/patch/kdewebdev.patch b/source.local/kde/patch/kdewebdev.patch
new file mode 100644
index 0000000..ccac0a7
--- /dev/null
+++ b/source.local/kde/patch/kdewebdev.patch
@@ -0,0 +1,5 @@
+# Make it find tidy:
+zcat $CWD/patch/kdewebdev/include-tidy.patch.gz \
+  | sed -e "s#/tmp/package-kdewebdev#${SLACK_KDE_BUILD_DIR}/${module}/package-kdewebdev#" \
+  | patch -p0 --verbose \
+  || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source.local/kde/patch/kdewebdev/include-tidy.patch.gz b/source.local/kde/patch/kdewebdev/include-tidy.patch.gz
new file mode 100644
index 0000000..be1d83a
--- /dev/null
+++ b/source.local/kde/patch/kdewebdev/include-tidy.patch.gz
diff --git a/source.local/kde/patch/korundum.patch b/source.local/kde/patch/korundum.patch
new file mode 100644
index 0000000..9581aa9
--- /dev/null
+++ b/source.local/kde/patch/korundum.patch
@@ -0,0 +1,4 @@
+# Build against Ruby 1.9.3.
+# See also https://bugs.kde.org/show_bug.cgi?id=287057
+zcat $CWD/patch/korundum/korundum_ruby19.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/source.local/kde/patch/korundum/korundum_ruby19.patch.gz b/source.local/kde/patch/korundum/korundum_ruby19.patch.gz
new file mode 100644
index 0000000..2463d0a
--- /dev/null
+++ b/source.local/kde/patch/korundum/korundum_ruby19.patch.gz
diff --git a/source.local/kde/patch/strigi-multimedia.patch b/source.local/kde/patch/strigi-multimedia.patch
new file mode 100644
index 0000000..8b03abd
--- /dev/null
+++ b/source.local/kde/patch/strigi-multimedia.patch
@@ -0,0 +1,3 @@
+# Fix build:
+zcat $CWD/patch/strigi-multimedia/strigi-multimedia_port.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/source.local/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz b/source.local/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz
new file mode 100644
index 0000000..86a6172
--- /dev/null
+++ b/source.local/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz
diff --git a/source.local/kde/post-install/k3b.post-install b/source.local/kde/post-install/k3b.post-install
new file mode 100644
index 0000000..8810114
--- /dev/null
+++ b/source.local/kde/post-install/k3b.post-install
@@ -0,0 +1,2 @@
+# Move the dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
diff --git a/source.local/kde/post-install/kde-baseapps.post-install b/source.local/kde/post-install/kde-baseapps.post-install
new file mode 100644
index 0000000..8dda636
--- /dev/null
+++ b/source.local/kde/post-install/kde-baseapps.post-install
@@ -0,0 +1,9 @@
+# Add profile scripts
+mkdir -p $PKG/etc/profile.d
+cat $CWD/post-install/kde-baseapps/profile.d/kde.sh \
+  | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \
+  > $PKG/etc/profile.d/kde.sh
+cat $CWD/post-install/kde-baseapps/profile.d/kde.csh \
+  | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \
+  > $PKG/etc/profile.d/kde.csh
+chmod 0755 $PKG/etc/profile.d/*
diff --git a/source.local/kde/post-install/kde-baseapps/profile.d/kde.csh b/source.local/kde/post-install/kde-baseapps/profile.d/kde.csh
new file mode 100644
index 0000000..a09579b
--- /dev/null
+++ b/source.local/kde/post-install/kde-baseapps/profile.d/kde.csh
@@ -0,0 +1,12 @@
+#!/bin/csh
+# KDE additions:
+if ( ! $?KDEDIRS ) then
+    setenv KDEDIRS /usr
+endif
+setenv PATH ${PATH}:/usr/lib/kde4/libexec
+
+if ( $?XDG_CONFIG_DIRS ) then
+    setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg
+else
+    setenv XDG_CONFIG_DIRS /etc/xdg:/etc/kde/xdg
+endif
diff --git a/source.local/kde/post-install/kde-baseapps/profile.d/kde.sh b/source.local/kde/post-install/kde-baseapps/profile.d/kde.sh
new file mode 100644
index 0000000..6f0199e
--- /dev/null
+++ b/source.local/kde/post-install/kde-baseapps/profile.d/kde.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# KDE additions:
+KDEDIRS=/usr
+export KDEDIRS
+PATH="$PATH:/usr/lib/kde4/libexec"
+export PATH
+if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
+  XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
+else
+  XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg
+fi
+export XDG_CONFIG_DIRS
+
diff --git a/source.local/kde/post-install/kde-runtime.post-install b/source.local/kde/post-install/kde-runtime.post-install
new file mode 100644
index 0000000..fbdacfa
--- /dev/null
+++ b/source.local/kde/post-install/kde-runtime.post-install
@@ -0,0 +1,9 @@
+# Create a symlink in /usr/bin to the kdesu binary
+( cd $PKG/usr/bin ; ln -s /usr/lib${LIBDIRSUFFIX}/kde4/libexec/kdesu . )
+
+# Remove the hicolor icon theme index.theme so it doesn't clobber the real one
+rm -f $PKG/usr/share/icons/hicolor/index.theme
+
+# Move the dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
+
diff --git a/source.local/kde/post-install/kde-workspace.post-install b/source.local/kde/post-install/kde-workspace.post-install
new file mode 100644
index 0000000..69952c7
--- /dev/null
+++ b/source.local/kde/post-install/kde-workspace.post-install
@@ -0,0 +1,46 @@
+
+# Use ck-launch-session in runlevel 3,
+# to start and attach a ConsoleKit session to the X session:
+mkdir -p $PKG/etc/X11/xinit
+cat $CWD/post-install/kde-workspace/xinit/xinitrc.kde > $PKG/etc/X11/xinit/xinitrc.kde
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.kde
+
+# Setup config files for KDM:
+$PKG/usr/bin/genkdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/share/config/kdm
+
+# Add Slackware's standard xsessions path to kdmrc and remove the redundant
+# xsession files for XFCE (those are installed by the xcfe package):
+if ! grep -q "SessionsDirs=/usr/share/xsessions" $PKG/usr/share/config/kdm/kdmrc ; then
+  sed -i -e "/SessionsDirs=/s#SessionsDirs=\(.*\)\$#SessionsDirs=/usr/share/xsessions,\1#" $PKG/usr/share/config/kdm/kdmrc
+fi
+rm $PKG/usr/share/apps/kdm/sessions/xfce*.desktop
+
+# Not allowing root to login at the console is just plain silly.  If they 
+# have physical access to the machine, what's the point of trying to stop 
+# this?  Even the kdmrc file says this is supposed to be the default.
+sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \
+  $PKG/usr/share/config/kdm/kdmrc 
+# We are also not ready to create a separate 'kdm' non-root user:
+sed -i 's/GreeterUID=kdm/#&/' \
+  $PKG/usr/share/config/kdm/kdmrc 
+
+# Add a .new suffix so we don't mangle an existing file:
+mv $PKG/usr/share/config/kdm/kdmrc $PKG/usr/share/config/kdm/kdmrc.new
+
+cp -a $PKG/usr/share/config/kdm/Xsession $PKG/usr/share/config/kdm/Xsession.orig
+cat $CWD/post-install/kde-workspace/config/Xsession | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
+  > $PKG/usr/share/config/kdm/Xsession
+
+# Add a .new suffix so we don't mangle an existing file:
+mv $PKG/usr/share/config/kdm/backgroundrc $PKG/usr/share/config/kdm/backgroundrc.new
+
+# Move the KDM files someplace FHS compliant:
+mkdir -p $PKG/etc/kde
+mv $PKG/usr/share/config/kdm $PKG/etc/kde
+( cd $PKG/usr/share/config ; ln -sf ../../../etc/kde/kdm . )
+
+# Move the polkit dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
+
+# This is fubar:
+rm -f $PKG/usr/share/icons/hicolor/index.theme
diff --git a/source.local/kde/post-install/kde-workspace/config/Xsession b/source.local/kde/post-install/kde-workspace/config/Xsession
new file mode 100644
index 0000000..736f5d5
--- /dev/null
+++ b/source.local/kde/post-install/kde-workspace/config/Xsession
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Xsession - run as user
+ 
+# Merged in parts of the old Xsession to load defaults from
+# Xresources and Xmodmap files, 2006-02-09 volkerdi
+# Merged with the new Xsession (original) from KDE4, 20071220 rworkman
+
+ session=$1
+ 
+# This section is borrowed from the old X11 Xsession file:
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/usr/lib/X11/xinit/.Xresources
+sysmodmap=/usr/lib/X11/xinit/.Xmodmap
+# merge in defaults and keymaps
+if [ -r $sysresources ]; then
+        /usr/bin/xrdb -merge $sysresources
+fi
+if [ -r $sysmodmap ]; then
+        /usr/bin/xmodmap $sysmodmap
+fi
+if [ -r $userresources ]; then
+        /usr/bin/xrdb -merge $userresources
+fi
+if [ -r $usermodmap ]; then
+        /usr/bin/xmodmap $usermodmap
+fi
+
+# Note that the respective logout scripts are not sourced.
+case $SHELL in
+  */bash)
+    [ -z "$BASH" ] && exec $SHELL $0 "$@"
+    set +o posix
+    [ -f /etc/profile ] && . /etc/profile
+    if [ -f $HOME/.bash_profile ]; then
+      . $HOME/.bash_profile
+    elif [ -f $HOME/.bash_login ]; then
+      . $HOME/.bash_login
+    elif [ -f $HOME/.profile ]; then
+      . $HOME/.profile
+    fi
+    ;;
+  */zsh)
+    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
+    emulate -R zsh
+    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
+    zhome=${ZDOTDIR:-$HOME}
+    # zshenv is always sourced automatically.
+    [ -f $zdir/zprofile ] && . $zdir/zprofile
+    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
+    [ -f $zdir/zlogin ] && . $zdir/zlogin
+    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
+    ;;
+  */csh|*/tcsh)
+    # [t]cshrc is always sourced automatically.
+    # Note that sourcing csh.login after .cshrc is non-standard.
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
+  *) # Plain sh, ksh, and anything we do not know.
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
+    ;;
+esac
+
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f $HOME/.xprofile ] && . $HOME/.xprofile
+
+case $session in
+  "")
+    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+    ;;
+  failsafe)
+    exec xterm -geometry 80x24-0-0
+    ;;
+  custom)
+    exec $HOME/.xsession
+    ;;
+  default)
+    exec /usr/bin/startkde
+    ;;
+  *)
+    eval exec "$session"
+    ;;
+esac
+exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/source.local/kde/post-install/kde-workspace/config/Xsession.orig b/source.local/kde/post-install/kde-workspace/config/Xsession.orig
new file mode 100644
index 0000000..43d78b8
--- /dev/null
+++ b/source.local/kde/post-install/kde-workspace/config/Xsession.orig
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Xsession - run as user
+
+session=$1
+
+# Note that the respective logout scripts are not sourced.
+case $SHELL in
+  */bash)
+    [ -z "$BASH" ] && exec $SHELL $0 "$@"
+    set +o posix
+    [ -f /etc/profile ] && . /etc/profile
+    if [ -f $HOME/.bash_profile ]; then
+      . $HOME/.bash_profile
+    elif [ -f $HOME/.bash_login ]; then
+      . $HOME/.bash_login
+    elif [ -f $HOME/.profile ]; then
+      . $HOME/.profile
+    fi
+    ;;
+  */zsh)
+    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
+    emulate -R zsh
+    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
+    zhome=${ZDOTDIR:-$HOME}
+    # zshenv is always sourced automatically.
+    [ -f $zdir/zprofile ] && . $zdir/zprofile
+    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
+    [ -f $zdir/zlogin ] && . $zdir/zlogin
+    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
+    ;;
+  */csh|*/tcsh)
+    # [t]cshrc is always sourced automatically.
+    # Note that sourcing csh.login after .cshrc is non-standard.
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
+  *) # Plain sh, ksh, and anything we do not know.
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
+    ;;
+esac
+
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f $HOME/.xprofile ] && . $HOME/.xprofile
+
+case $session in
+  "")
+    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+    ;;
+  failsafe)
+    exec xterm -geometry 80x24-0-0
+    ;;
+  custom)
+    exec $HOME/.xsession
+    ;;
+  default)
+    exec /usr/bin/startkde
+    ;;
+  *)
+    eval exec "$session"
+    ;;
+esac
+exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/source.local/kde/post-install/kde-workspace/xinit/xinitrc.kde b/source.local/kde/post-install/kde-workspace/xinit/xinitrc.kde
new file mode 100644
index 0000000..a33eb06
--- /dev/null
+++ b/source.local/kde/post-install/kde-workspace/xinit/xinitrc.kde
@@ -0,0 +1,32 @@
+#!/bin/sh
+# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    xmodmap $usermodmap
+fi
+
+# Start the window manager:
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+    ck-launch-session startkde
+else
+    startkde
+fi
diff --git a/source.local/kde/post-install/kdelibs.post-install b/source.local/kde/post-install/kdelibs.post-install
new file mode 100644
index 0000000..9239a3e
--- /dev/null
+++ b/source.local/kde/post-install/kdelibs.post-install
@@ -0,0 +1,2 @@
+# Move the polkit dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
diff --git a/source.local/kde/post-install/kdepim.post-install b/source.local/kde/post-install/kdepim.post-install
new file mode 100644
index 0000000..8810114
--- /dev/null
+++ b/source.local/kde/post-install/kdepim.post-install
@@ -0,0 +1,2 @@
+# Move the dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
diff --git a/source.local/kde/post-install/konsole.post-install b/source.local/kde/post-install/konsole.post-install
new file mode 100644
index 0000000..6104e9f
--- /dev/null
+++ b/source.local/kde/post-install/konsole.post-install
@@ -0,0 +1,13 @@
+# "konsole -ls" is no longer valid syntax for konsole, even though it's
+# still documented in the help manual.  Here's a way to get the same
+# thing, and it works here, but I honestly don't know how it will act
+# everywhere with every shell.  I just know it works with bash and ksh
+# Removed in KDE 4.9.4 package because it does not work:
+#sed -i -e 's/^Exec=konsole/Exec=konsole -e $SHELL -l/' \
+#  $PKG/usr/share/applications/kde4/konsole.desktop
+
+## I find this a little bit too bright...  <change by pjv>
+## Change the konsole defaults to look like the real Linux console:
+#sed -i 's/ColorScheme=Linux/ColorScheme=WhiteOnBlack/' \
+#  $PKG/usr/share/apps/konsole/Shell.profile
+
diff --git a/source.local/kde/post-install/wicd-kde.post-install b/source.local/kde/post-install/wicd-kde.post-install
new file mode 100644
index 0000000..8810114
--- /dev/null
+++ b/source.local/kde/post-install/wicd-kde.post-install
@@ -0,0 +1,2 @@
+# Move the dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
diff --git a/source.local/kde/pre-install/README b/source.local/kde/pre-install/README
new file mode 100644
index 0000000..2478e45
--- /dev/null
+++ b/source.local/kde/pre-install/README
@@ -0,0 +1,18 @@
+
+IMPORTANT!
+
+To fail/exit a script, use this:
+
+[command that fails] || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+DO NOT USE THIS:
+
+[command that fails] || exit 1
+
+as it will cause the parent script to exit in the wrong location and possibly
+silently skip building some packages.
+
+Thanks,
+
+The Management
+
diff --git a/source.local/kde/pre-install/amarok.pre-install b/source.local/kde/pre-install/amarok.pre-install
new file mode 100644
index 0000000..dfb3b00
--- /dev/null
+++ b/source.local/kde/pre-install/amarok.pre-install
@@ -0,0 +1,10 @@
+if [ ! -r /usr/bin/mysql_embedded ]; then
+  cat << EOF
+ERROR:  missing /usr/bin/mysql_embedded
+        please use mysql-embedded.SlackBuild in source/ap/mysql/
+        or build_embedded.package.sh in source/ap/mariadb/ to
+        rebuild your database package, reinstall it, and then try again.
+EOF
+  touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ;
+fi
+
diff --git a/source.local/kde/pre-install/kdewebdev.pre-install b/source.local/kde/pre-install/kdewebdev.pre-install
new file mode 100644
index 0000000..6cd51b1
--- /dev/null
+++ b/source.local/kde/pre-install/kdewebdev.pre-install
@@ -0,0 +1,6 @@
+# First, build and install Tidy:
+cd $CWD/pre-install/kdewebdev/tidy 
+  echo "Building htmltidy..."
+  ARCH=$ARCH sh ./tidy.build $PKG
+cd -
+
diff --git a/source.local/kde/pre-install/kdewebdev/tidy/get-tidy-cvs.sh b/source.local/kde/pre-install/kdewebdev/tidy/get-tidy-cvs.sh
new file mode 100644
index 0000000..e4fb4b2
--- /dev/null
+++ b/source.local/kde/pre-install/kdewebdev/tidy/get-tidy-cvs.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright 2006, 2009  Patrick 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.
+#
+
+# Fetch the latest CVS of Tidy.
+# Clean the download location:
+rm -rf tidy
+cvs -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy login
+CVS_VERSION=$(date +%Y%m%dT%R | tr -d :)
+# Doubtful that these will exist, but...
+rm -f tidy-${CVS_VERSION}.tar tidy-${CVS_VERSION}.tar.xz
+cvs -z3 -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy co -P tidy
+# Rid ourselves of cruft:
+( cd tidy ; find . -type d -name CVS -exec rm -rf {} \; 2> /dev/null )
+# Make tarball "release":
+tar cf tidy-${CVS_VERSION}.tar tidy
+xz -9 tidy-${CVS_VERSION}.tar
+# Clean up:
+rm -rf tidy
diff --git a/source.local/kde/pre-install/kdewebdev/tidy/tidy.SlackBuild b/source.local/kde/pre-install/kdewebdev/tidy/tidy.SlackBuild
new file mode 100755
index 0000000..a1d3a8a
--- /dev/null
+++ b/source.local/kde/pre-install/kdewebdev/tidy/tidy.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+# Copyright 2006, 2007, 2008, 2009, 2010  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.
+
+# This file is an example, so feel free to fix it if it gets out of date.  :-)
+
+PKGNAM=tidy
+VERSION=${VERSION:-20100503T2309}
+BUILD=${BUILD:-1}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf ${PKGNAM}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z*
+
+cd ${PKGNAM}
+
+# Make sure ownerships and permissions are sane:
+chown -R root:root .
+find . -perm 666 -exec chmod 644 {} \;
+find . -perm 664 -exec chmod 644 {} \;
+find . -perm 600 -exec chmod 644 {} \;
+find . -perm 444 -exec chmod 644 {} \;
+find . -perm 400 -exec chmod 644 {} \;
+find . -perm 440 -exec chmod 644 {} \;
+find . -perm 777 -exec chmod 755 {} \;
+find . -perm 775 -exec chmod 755 {} \;
+find . -perm 511 -exec chmod 755 {} \;
+find . -perm 711 -exec chmod 755 {} \;
+find . -perm 555 -exec chmod 755 {} \;
+
+# Prepare autoconf:
+sh build/gnuauto/setup.sh
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --disable-static \
+  --build=$TARGET
+
+# Build and install:
+make -j4 || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+# The Makefile evidently contains the package's license...
+cp -a Makefile htmldoc $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/kde/pre-install/kdewebdev/tidy/tidy.build b/source.local/kde/pre-install/kdewebdev/tidy/tidy.build
new file mode 100644
index 0000000..7889ccc
--- /dev/null
+++ b/source.local/kde/pre-install/kdewebdev/tidy/tidy.build
@@ -0,0 +1,103 @@
+#!/bin/sh
+# Copyright 2006, 2007, 2008, 2009, 2010  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.
+
+# Modified by Robby Workman <rworkman@slackware.com> 20071221 
+# for new cvs pull and changed include directory for kde4's kdewebdev
+# New cvs version - 20080502
+
+PKGNAM=tidy
+VERSION=20100503T2309
+BUILD=${BUILD:-1}
+
+PKG=$1
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+cd $TMP
+rm -rf ${PKGNAM}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}
+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 {} \;
+
+# Prepare autoconf:
+sh build/gnuauto/setup.sh
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --includedir=/usr/include/tidy \
+  --disable-static \
+  --build=$TARGET
+
+make -j4 || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a htmldoc/* $PKG/usr/doc/${PKGNAM}-$VERSION
+
diff --git a/source.local/kde/slack-desc/amarok b/source.local/kde/slack-desc/amarok
new file mode 100644
index 0000000..8ee6397
--- /dev/null
+++ b/source.local/kde/slack-desc/amarok
@@ -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------------------------------------------------------|
+amarok: amarok (music player)
+amarok:
+amarok: Amarok is a music player for Linux and Unix with an intuitive
+amarok: interface.  Amarok makes playing the music you love easier than ever
+amarok: before -- and looks good doing it.
+amarok:
+amarok: Amarok's home page is:  http://amarok.kde.org
+amarok:
+amarok:
+amarok:
+amarok:
diff --git a/source.local/kde/slack-desc/analitza b/source.local/kde/slack-desc/analitza
new file mode 100644
index 0000000..84123be
--- /dev/null
+++ b/source.local/kde/slack-desc/analitza
@@ -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------------------------------------------------------|
+analitza: analitza (library to add mathematical features to programs)
+analitza:
+analitza: The analitza library will let you add mathematical features
+analitza: to your program. 
+analitza:
+analitza: For more information, visit:
+analitza:   https://projects.kde.org/projects/kde/kdeedu/analitza
+analitza:
+analitza:
+analitza:
+analitza:
diff --git a/source.local/kde/slack-desc/ark b/source.local/kde/slack-desc/ark
new file mode 100644
index 0000000..93dd1c8
--- /dev/null
+++ b/source.local/kde/slack-desc/ark
@@ -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------------------------------------------------------|
+ark: ark (KDE archiver tool)
+ark:
+ark: This is KDE's application to work with compressed archives.
+ark:
+ark: Ark's home page is:  http://kde.org
+ark:
+ark:
+ark:
+ark:
+ark:
+ark:
diff --git a/source.local/kde/slack-desc/audiocd-kio b/source.local/kde/slack-desc/audiocd-kio
new file mode 100644
index 0000000..a82bd28
--- /dev/null
+++ b/source.local/kde/slack-desc/audiocd-kio
@@ -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------------------------------------------------------|
+audiocd-kio: audiocd-kio (audiocd kio slave)
+audiocd-kio:
+audiocd-kio: Audiocd kio slave.
+audiocd-kio:
+audiocd-kio:
+audiocd-kio:
+audiocd-kio:
+audiocd-kio:
+audiocd-kio:
+audiocd-kio: For more information, visit:  http://www.kde.org
+audiocd-kio:
diff --git a/source.local/kde/slack-desc/blinken b/source.local/kde/slack-desc/blinken
new file mode 100644
index 0000000..72773dd
--- /dev/null
+++ b/source.local/kde/slack-desc/blinken
@@ -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------------------------------------------------------|
+blinken: blinken (a memory enhancement game)
+blinken:
+blinken: Blinken is a memory enhancement game for KDE.
+blinken:
+blinken: For more information, visit:  http://edu.kde.org/
+blinken:
+blinken:
+blinken:
+blinken:
+blinken:
+blinken:
diff --git a/source.local/kde/slack-desc/bluedevil b/source.local/kde/slack-desc/bluedevil
new file mode 100644
index 0000000..60e3dde
--- /dev/null
+++ b/source.local/kde/slack-desc/bluedevil
@@ -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------------------------------------------------------|
+bluedevil: bluedevil (bluetooth stack for KDE)
+bluedevil:
+bluedevil: BlueDevil is the bluetooth stack for KDE.
+bluedevil:
+bluedevil: Homepage: http://www.afiestas.org/
+bluedevil:
+bluedevil:
+bluedevil:
+bluedevil:
+bluedevil:
+bluedevil:
diff --git a/source.local/kde/slack-desc/bomber b/source.local/kde/slack-desc/bomber
new file mode 100644
index 0000000..cae9a73
--- /dev/null
+++ b/source.local/kde/slack-desc/bomber
@@ -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------------------------------------------------------|
+bomber: bomber (arcade bombing game for KDE)
+bomber:
+bomber: Bomber is a single player arcade game. The player is invading various
+bomber: cities in a plane that is decreasing in height.  The goal of the game
+bomber: is to destroy all the buildings and advance to the next level.
+bomber: Each level gets a bit harder by increasing the speed of the plane
+bomber: and the height of the buildings.
+bomber:
+bomber:
+bomber: For more information, visit:  http://www.kde.org
+bomber:
diff --git a/source.local/kde/slack-desc/bovo b/source.local/kde/slack-desc/bovo
new file mode 100644
index 0000000..8ccebb3
--- /dev/null
+++ b/source.local/kde/slack-desc/bovo
@@ -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------------------------------------------------------|
+bovo: bovo (five-in-a-row board game)
+bovo:
+bovo: Bovo is a Gomoku ("five points" in Japanese) like game for two
+bovo: players, where the opponents alternate in placing their respective
+bovo: pictogram on the game board.  Also known as: Connect Five,
+bovo: Five in a row, X and O, Naughts and Crosses.
+bovo:
+bovo:
+bovo:
+bovo: For more information, visit:  http://www.kde.org
+bovo:
diff --git a/source.local/kde/slack-desc/calligra b/source.local/kde/slack-desc/calligra
new file mode 100644
index 0000000..a1f5261
--- /dev/null
+++ b/source.local/kde/slack-desc/calligra
@@ -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------------------------------------------------------|
+calligra: calligra (KDE office productivity suite)
+calligra:
+calligra: Calligra office productivity applications.  Included are a word
+calligra: processor, spreadsheet, presentation program, chart and graph creator,
+calligra: vector graphics tool, database report creator, flowcharting program,
+calligra: integrated data management program, a pixel graphics editor,
+calligra: a mathematical formula editor, and Calligra Workspace
+calligra: (a combination of all of the above).
+calligra:
+calligra: For more information, see:  http://calligra-suite.org/
+calligra:
diff --git a/source.local/kde/slack-desc/cantor b/source.local/kde/slack-desc/cantor
new file mode 100644
index 0000000..34cf867
--- /dev/null
+++ b/source.local/kde/slack-desc/cantor
@@ -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------------------------------------------------------|
+cantor: cantor (front-end to mathematics software)
+cantor:
+cantor: Cantor is a frontend to several existing mathematical software
+cantor: such as R, Sage and Maxima: Cantor.
+cantor: Cantor offers a worksheet as a nice GUI for all those backends
+cantor: and is not targeted to kids but to scientists.
+cantor:
+cantor: For more information, visit:  http://edu.kde.org/
+cantor:
+cantor:
+cantor:
diff --git a/source.local/kde/slack-desc/digikam b/source.local/kde/slack-desc/digikam
new file mode 100644
index 0000000..607801e
--- /dev/null
+++ b/source.local/kde/slack-desc/digikam
@@ -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-----------------------------------------------------|
+digikam: digiKam (KDE Photo Management Application)
+digikam:
+digikam: digiKam is a simple digital photo management application for KDE,
+digikam: which makes importing and organizing digital photos a "snap". The
+digikam: photos can be organized in albums which can be sorted
+digikam: chronologically, by directory layout, or by custom collections.  An
+digikam: easy to use interface enables you to connect to your camera and
+digikam: preview, download, and/or delete your images.
+digikam:
+digikam: Homepage: http://www.digikam.org/
+digikam:
diff --git a/source.local/kde/slack-desc/dragon b/source.local/kde/slack-desc/dragon
new file mode 100644
index 0000000..115fda1
--- /dev/null
+++ b/source.local/kde/slack-desc/dragon
@@ -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------------------------------------------------------|
+dragon: dragon (KDE multimedia player)
+dragon:
+dragon: Dragon Player is a multimedia player where the focus is on simplicity,
+dragon: instead of features.  Dragon Player does one thing, and only one
+dragon: thing, which is playing multimedia files.
+dragon:
+dragon:
+dragon:
+dragon:
+dragon: For more information, visit:  http://www.kde.org
+dragon:
diff --git a/source.local/kde/slack-desc/ffmpegthumbs b/source.local/kde/slack-desc/ffmpegthumbs
new file mode 100644
index 0000000..6ff665f
--- /dev/null
+++ b/source.local/kde/slack-desc/ffmpegthumbs
@@ -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------------------------------------------------------|
+ffmpegthumbs: ffmpegthumbs (video thumbnail generator using ffmpeg)
+ffmpegthumbs:
+ffmpegthumbs: FFMpegThumbs is a video thumbnail generator for KDE file managers
+ffmpegthumbs: like Dolphin and Konqueror.  It enables them to show preview
+ffmpegthumbs: images of video files using FFMpeg. 
+ffmpegthumbs:
+ffmpegthumbs:
+ffmpegthumbs:
+ffmpegthumbs:
+ffmpegthumbs: For more information, visit:  http://www.kde.org
+ffmpegthumbs:
diff --git a/source.local/kde/slack-desc/filelight b/source.local/kde/slack-desc/filelight
new file mode 100644
index 0000000..f86e2f0
--- /dev/null
+++ b/source.local/kde/slack-desc/filelight
@@ -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 mfilelights 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------------------------------------------------------|
+filelight: filelight (file system monitor)
+filelight:
+filelight: Filelight allows you to quickly understand exactly where your
+filelight: diskspace is being used by graphically representing your file system.
+filelight:
+filelight: filelight's home page is:  http://utils.kde.org/projects/filelight
+filelight:
+filelight:
+filelight:
+filelight:
+filelight:
diff --git a/source.local/kde/slack-desc/granatier b/source.local/kde/slack-desc/granatier
new file mode 100644
index 0000000..6eb3695
--- /dev/null
+++ b/source.local/kde/slack-desc/granatier
@@ -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------------------------------------------------------|
+granatier: granatier (bomberman clone for KDE)
+granatier:
+granatier: Granatier is a clone of the classic Bomberman game, inspired by
+granatier: the work of the Clanbomber clone.
+granatier:
+granatier:
+granatier:
+granatier:
+granatier:
+granatier: For more information, visit:  http://www.kde.org
+granatier:
diff --git a/source.local/kde/slack-desc/gwenview b/source.local/kde/slack-desc/gwenview
new file mode 100644
index 0000000..bc56b12
--- /dev/null
+++ b/source.local/kde/slack-desc/gwenview
@@ -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------------------------------------------------------|
+gwenview: gwenview (image viewer for KDE)
+gwenview:
+gwenview: Gwenview is a simple image viewer for KDE.  It features a folder tree
+gwenview: window and a file list window, providing easy navigation of your file
+gwenview: hierarchy.
+gwenview:
+gwenview: For more information, visit:  http://www.kde.org
+gwenview:
+gwenview:
+gwenview:
+gwenview:
diff --git a/source.local/kde/slack-desc/jovie b/source.local/kde/slack-desc/jovie
new file mode 100644
index 0000000..6a52283
--- /dev/null
+++ b/source.local/kde/slack-desc/jovie
@@ -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------------------------------------------------------|
+jovie: jovie (Text-to-speech daemon)
+jovie:
+jovie: Jovie is the KDE Text To Speech Daemon, which can be used from any
+jovie: KDE application that uses the interface from kdelibs.
+jovie:
+jovie: For more information, visit:  http://www.kde.org
+jovie:
+jovie:
+jovie:
+jovie:
+jovie:
diff --git a/source.local/kde/slack-desc/juk b/source.local/kde/slack-desc/juk
new file mode 100644
index 0000000..bad97bd
--- /dev/null
+++ b/source.local/kde/slack-desc/juk
@@ -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------------------------------------------------------|
+juk: juk (audio jukebox application)
+juk:
+juk: JuK is an audio jukebox application, supporting collections of MP3,
+juk: Ogg Vorbis, and FLAC audio files.  It allows you to edit the "tags"
+juk: of your audio files, and manage your collection and playlists.
+juk: It's main focus, in fact, is on music management.
+juk:
+juk:
+juk:
+juk: For more information, visit:  http://www.kde.org
+juk:
diff --git a/source.local/kde/slack-desc/k3b b/source.local/kde/slack-desc/k3b
new file mode 100644
index 0000000..032bbb8
--- /dev/null
+++ b/source.local/kde/slack-desc/k3b
@@ -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------------------------------------------------------|
+k3b: k3b (The CD Creator)
+k3b:
+k3b: K3b makes writing cds under Linux easy.  It has an easy to use
+k3b: interface and supports CD burning (including on-the-fly), copying,
+k3b: erasing, ripping, and more.
+k3b:
+k3b: K3b was written by Sebastian Trueg, Thomas Froescher,
+k3b: Christian Kvasny, and Klaus-Dieter Krannich.
+k3b:
+k3b: For more information, visit:  http://www.k3b.org
+k3b:
diff --git a/source.local/kde/slack-desc/kaccessible b/source.local/kde/slack-desc/kaccessible
new file mode 100644
index 0000000..77b9663
--- /dev/null
+++ b/source.local/kde/slack-desc/kaccessible
@@ -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------------------------------------------------------|
+kaccessible: kaccessible (Accessibility bridge)
+kaccessible:
+kaccessible: Kaccessible implements a QAccessibleBridgePlugin to provide
+kaccessible: accessibility services like focus tracking and a screenreader.
+kaccessible:
+kaccessible: For more information, visit:  http://www.kde.org
+kaccessible:
+kaccessible:
+kaccessible:
+kaccessible:
+kaccessible:
diff --git a/source.local/kde/slack-desc/kactivities b/source.local/kde/slack-desc/kactivities
new file mode 100644
index 0000000..2ca504a
--- /dev/null
+++ b/source.local/kde/slack-desc/kactivities
@@ -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------------------------------------------------------|
+kactivities: kactivities (API for using and interacting with Activities)
+kactivities:
+kactivities: API for using and interacting with Activities as a consumer,
+kactivities: application adding information to them or as an activity manager.
+kactivities:
+kactivities: For more information, visit:  http://www.kde.org
+kactivities:
+kactivities:
+kactivities:
+kactivities:
+kactivities:
diff --git a/source.local/kde/slack-desc/kajongg b/source.local/kde/slack-desc/kajongg
new file mode 100644
index 0000000..eb317ef
--- /dev/null
+++ b/source.local/kde/slack-desc/kajongg
@@ -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------------------------------------------------------|
+kajongg: kajongg (Mah Jongg for KDE)
+kajongg:
+kajongg: Kajongg is the ancient Chinese board game for 4 players.
+kajongg: Kajongg can be used in two different ways: Scoring a manual game where
+kajongg: you play as always and use Kajongg for the computation of scores and
+kajongg: for bookkeeping.  Or you can use Kajongg to play against any
+kajongg: combination of other human players or computer players.
+kajongg:
+kajongg:
+kajongg: For more information, visit:  http://www.kde.org
+kajongg:
diff --git a/source.local/kde/slack-desc/kalgebra b/source.local/kde/slack-desc/kalgebra
new file mode 100644
index 0000000..aefc3cc
--- /dev/null
+++ b/source.local/kde/slack-desc/kalgebra
@@ -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------------------------------------------------------|
+kalgebra: kalgebra (a graph calculator)
+kalgebra:
+kalgebra: KAlgebra is a MathML-based graph calculator.  It was initially mathml
+kalgebra: oriented, but now it can be used by anyone with a little mathematic
+kalgebra: knowledge.
+kalgebra:
+kalgebra: For more information, visit:  http://edu.kde.org/
+kalgebra:
+kalgebra:
+kalgebra:
+kalgebra:
diff --git a/source.local/kde/slack-desc/kalzium b/source.local/kde/slack-desc/kalzium
new file mode 100644
index 0000000..b96c7bc
--- /dev/null
+++ b/source.local/kde/slack-desc/kalzium
@@ -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------------------------------------------------------|
+kalzium: kalzium (periodic table of the elements)
+kalzium:
+kalzium: Kalzium shows a periodic table of the elements.
+kalzium:
+kalzium: For more information, visit:  http://edu.kde.org/
+kalzium:
+kalzium:
+kalzium:
+kalzium:
+kalzium:
+kalzium:
diff --git a/source.local/kde/slack-desc/kamera b/source.local/kde/slack-desc/kamera
new file mode 100644
index 0000000..8d86f1d
--- /dev/null
+++ b/source.local/kde/slack-desc/kamera
@@ -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------------------------------------------------------|
+kamera: kamera (digital camera support for KDE)
+kamera:
+kamera: Digital camera support for KDE.
+kamera:
+kamera: For more information, visit:  http://www.kde.org
+kamera:
+kamera:
+kamera:
+kamera:
+kamera:
+kamera:
diff --git a/source.local/kde/slack-desc/kanagram b/source.local/kde/slack-desc/kanagram
new file mode 100644
index 0000000..98288f5
--- /dev/null
+++ b/source.local/kde/slack-desc/kanagram
@@ -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------------------------------------------------------|
+kanagram: kanagram (letter game)
+kanagram:
+kanagram: Kanagram is a replacement for KMessedWords.  Kanagram mixes up the
+kanagram: letters of a word to create an anagram, and you have to guess what
+kanagram: the mixed up word is.  Kanagram features several built-in word lists,
+kanagram: hints, and a cheat feature which reveals the original word.
+kanagram: Kanagram also has a vocabulary editor.
+kanagram:
+kanagram: For more information, visit:  http://edu.kde.org/
+kanagram:
+kanagram:
diff --git a/source.local/kde/slack-desc/kapman b/source.local/kde/slack-desc/kapman
new file mode 100644
index 0000000..750a4ef
--- /dev/null
+++ b/source.local/kde/slack-desc/kapman
@@ -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------------------------------------------------------|
+kapman: kapman (KDE version of Pac-Man)
+kapman:
+kapman: Kapman is a clone of the well known game Pac-Man.
+kapman: You must run through the maze to eat all pills without being captured
+kapman: by a ghost.  By eating an energizer, Kapman gets the ability to eat
+kapman: ghosts for a few seconds.  When a stage is cleared of pills and
+kapman: energizer the player is taken to the next stage with slightly
+kapman: increased game speed.
+kapman:
+kapman: For more information, visit:  http://www.kde.org
+kapman:
diff --git a/source.local/kde/slack-desc/kate b/source.local/kde/slack-desc/kate
new file mode 100644
index 0000000..9b19944
--- /dev/null
+++ b/source.local/kde/slack-desc/kate
@@ -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-----------------------------------------------------|
+kate: kate (an advanced text editor for KDE)
+kate:
+kate: The Kate project develops two main products:
+kate: KatePart, the advanced editor component which is used in numerous KDE
+kate: applications requiring a text editing component, and Kate, a MDI text
+kate: editor application.  In addition, we provide KWrite, a simple SDI
+kate: editor shell which allows the user to select his/her favorite editor
+kate: component.
+kate:
+kate: Homepage: http://kate-editor.org
+kate:
diff --git a/source.local/kde/slack-desc/katomic b/source.local/kde/slack-desc/katomic
new file mode 100644
index 0000000..de76b51
--- /dev/null
+++ b/source.local/kde/slack-desc/katomic
@@ -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------------------------------------------------------|
+katomic: katomic (re-assemble molecules from compound atoms)
+katomic:
+katomic: Katomic is both fun and educational game built around molecular
+katomic: geometry.  It employs simplistic two-dimensional looks at different
+katomic: chemical elements.  You can also play an online demo version
+katomic: of this game. 
+katomic:
+katomic:
+katomic:
+katomic: For more information, visit:  http://www.kde.org
+katomic:
diff --git a/source.local/kde/slack-desc/kaudiocreator b/source.local/kde/slack-desc/kaudiocreator
new file mode 100644
index 0000000..3de3772
--- /dev/null
+++ b/source.local/kde/slack-desc/kaudiocreator
@@ -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-----------------------------------------------|
+kaudiocreator: kaudiocreator (CD ripper and audio encoder)
+kaudiocreator:
+kaudiocreator: kaudiocreater is a KDE frontend for ripping and encoding audio
+kaudiocreator: to/from optical media.
+kaudiocreator:
+kaudiocreator:
+kaudiocreator:
+kaudiocreator:
+kaudiocreator:
+kaudiocreator:
+kaudiocreator:
diff --git a/source.local/kde/slack-desc/kblackbox b/source.local/kde/slack-desc/kblackbox
new file mode 100644
index 0000000..a4525a2
--- /dev/null
+++ b/source.local/kde/slack-desc/kblackbox
@@ -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------------------------------------------------------|
+kblackbox: kblackbox (a game of hide and seek)
+kblackbox:
+kblackbox: KBlackbox is a game of hide and seek played on a grid of boxes
+kblackbox: where the computer has hidden several balls. 
+kblackbox:
+kblackbox:
+kblackbox:
+kblackbox:
+kblackbox:
+kblackbox: For more information, visit:  http://www.kde.org
+kblackbox:
diff --git a/source.local/kde/slack-desc/kblocks b/source.local/kde/slack-desc/kblocks
new file mode 100644
index 0000000..bdbfdfa
--- /dev/null
+++ b/source.local/kde/slack-desc/kblocks
@@ -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------------------------------------------------------|
+kblocks: kblocks (falling blocks game for KDE)
+kblocks:
+kblocks: KBlocks is the KDE version of the classic falling blocks game.
+kblocks:
+kblocks:
+kblocks:
+kblocks:
+kblocks:
+kblocks:
+kblocks: For more information, visit:  http://www.kde.org
+kblocks:
diff --git a/source.local/kde/slack-desc/kbounce b/source.local/kde/slack-desc/kbounce
new file mode 100644
index 0000000..2a98326
--- /dev/null
+++ b/source.local/kde/slack-desc/kbounce
@@ -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------------------------------------------------------|
+kbounce: kbounce (KDE Bounce Ball Game)
+kbounce:
+kbounce: KBounce is a single player arcade game with the elements of puzzle.
+kbounce: It is played on a field, surrounded by wall, with two or more balls
+kbounce: that move about in the field bouncing off of walls.
+kbounce: The player can build new walls, decreasing the size of active field. 
+kbounce:
+kbounce:
+kbounce:
+kbounce: For more information, visit:  http://www.kde.org
+kbounce:
diff --git a/source.local/kde/slack-desc/kbreakout b/source.local/kde/slack-desc/kbreakout
new file mode 100644
index 0000000..e9b53a1
--- /dev/null
+++ b/source.local/kde/slack-desc/kbreakout
@@ -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------------------------------------------------------|
+kbreakout: kbreakout (breakout-like game for KDE)
+kbreakout:
+kbreakout: KBreakout is the KDE version of a Breakout-like game.
+kbreakout:
+kbreakout:
+kbreakout:
+kbreakout:
+kbreakout:
+kbreakout:
+kbreakout: For more information, visit:  http://www.kde.org
+kbreakout:
diff --git a/source.local/kde/slack-desc/kbruch b/source.local/kde/slack-desc/kbruch
new file mode 100644
index 0000000..43a2aa3
--- /dev/null
+++ b/source.local/kde/slack-desc/kbruch
@@ -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------------------------------------------------------|
+kbruch: kbruch (calculate fractions)
+kbruch:
+kbruch: KBruch is a small program to practice calculating with fractions.
+kbruch:
+kbruch: For more information, visit:  http://edu.kde.org/
+kbruch:
+kbruch:
+kbruch:
+kbruch:
+kbruch:
+kbruch:
diff --git a/source.local/kde/slack-desc/kcalc b/source.local/kde/slack-desc/kcalc
new file mode 100644
index 0000000..f5144c5
--- /dev/null
+++ b/source.local/kde/slack-desc/kcalc
@@ -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 mkcalcs 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------------------------------------------------------|
+kcalc: kcalc (KDE calculator)
+kcalc:
+kcalc: KCalc is a calculator which offers many more mathematical functions
+kcalc: than meet the eye on a first glance.
+kcalc:
+kcalc: kcalc's home page is:  http://utils.kde.org/projects/kcalc
+kcalc:
+kcalc:
+kcalc:
+kcalc:
+kcalc:
diff --git a/source.local/kde/slack-desc/kcharselect b/source.local/kde/slack-desc/kcharselect
new file mode 100644
index 0000000..3c937dd
--- /dev/null
+++ b/source.local/kde/slack-desc/kcharselect
@@ -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 mkcharselects 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------------------------------------------------------|
+kcharselect: kcharselect (character picker)
+kcharselect:
+kcharselect: KCharSelect is a tool to select special characters from all
+kcharselect: installed fonts and copy them into the clipboard.
+kcharselect:
+kcharselect: kcharselect's home page:  http://utils.kde.org/projects/kcharselect
+kcharselect:
+kcharselect:
+kcharselect:
+kcharselect:
+kcharselect:
diff --git a/source.local/kde/slack-desc/kcolorchooser b/source.local/kde/slack-desc/kcolorchooser
new file mode 100644
index 0000000..61e356d
--- /dev/null
+++ b/source.local/kde/slack-desc/kcolorchooser
@@ -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------------------------------------------------------|
+kcolorchooser: kcolorchooser (color chooser)
+kcolorchooser:
+kcolorchooser: A color chooser application for KDE.
+kcolorchooser:
+kcolorchooser: For more information, visit:  http://www.kde.org
+kcolorchooser:
+kcolorchooser:
+kcolorchooser:
+kcolorchooser:
+kcolorchooser:
+kcolorchooser:
diff --git a/source.local/kde/slack-desc/kde-base b/source.local/kde/slack-desc/kde-base
new file mode 100644
index 0000000..d00d2bf
--- /dev/null
+++ b/source.local/kde/slack-desc/kde-base
@@ -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------------------------------------------------------|
+kde-base: kde-base (KDE core applications and files)
+kde-base:
+kde-base: This package provides the core applications and infrastructure files
+kde-base: for the KDE Plasma Desktop.
+kde-base:
+kde-base:
+kde-base:
+kde-base:
+kde-base:
+kde-base:
+kde-base:
diff --git a/source.local/kde/slack-desc/kde-base-artwork b/source.local/kde/slack-desc/kde-base-artwork
new file mode 100644
index 0000000..f7df2d0
--- /dev/null
+++ b/source.local/kde/slack-desc/kde-base-artwork
@@ -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------------------------------------------------------|
+kde-base-artwork: kde-base-artwork (KDE themes artwork)
+kde-base-artwork:
+kde-base-artwork: This package contains KSplash themes and other artwork.
+kde-base-artwork:
+kde-base-artwork: For more information, visit:  http://www.kde.org
+kde-base-artwork:
+kde-base-artwork:
+kde-base-artwork:
+kde-base-artwork:
+kde-base-artwork:
+kde-base-artwork:
diff --git a/source.local/kde/slack-desc/kde-baseapps b/source.local/kde/slack-desc/kde-baseapps
new file mode 100644
index 0000000..ad9ef35
--- /dev/null
+++ b/source.local/kde/slack-desc/kde-baseapps
@@ -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------------------------------------------------------|
+kde-baseapps: kde-baseapps (KDE core applications and files)
+kde-baseapps:
+kde-baseapps: This package provides the core applications and infrastructure files
+kde-baseapps: for the KDE Plasma Desktop.
+kde-baseapps:
+kde-baseapps: For more info, visit:  http://www.kde.org
+kde-baseapps:
+kde-baseapps:
+kde-baseapps:
+kde-baseapps:
+kde-baseapps:
diff --git a/source.local/kde/slack-desc/kde-bindings b/source.local/kde/slack-desc/kde-bindings
new file mode 100644
index 0000000..3602053
--- /dev/null
+++ b/source.local/kde/slack-desc/kde-bindings
@@ -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------------------------------------------------------|
+kde-bindings: kde-bindings (KDE language bindings)
+kde-bindings:
+kde-bindings: KDE and most KDE applications are implemented using the C++
+kde-bindings: programming language, but that doesn't mean you don't have a choice.
+kde-bindings: This package contains a number of bindings to other languages,
+kde-bindings: including scripting languages and other systems' programming
+kde-bindings: languages, allowing them to be used to create applications for the
+kde-bindings: KDE Platform.
+kde-bindings:
+kde-bindings:
+kde-bindings:
diff --git a/source.local/kde/slack-desc/kde-educational b/source.local/kde/slack-desc/kde-educational
new file mode 100644
index 0000000..bccdeb3
--- /dev/null
+++ b/source.local/kde/slack-desc/kde-educational
@@ -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------------------------------------------------------|
+kde-educational: kde-educational (Educational applications)
+kde-educational:
+kde-educational: Educational applications for the KDE Software Compilation.
+kde-educational:
+kde-educational:
+kde-educational:
+kde-educational:
+kde-educational:
+kde-educational:
+kde-educational:
+kde-educational:
diff --git a/source.local/kde/slack-desc/kde-runtime b/source.local/kde/slack-desc/kde-runtime
new file mode 100644
index 0000000..279b2bf
--- /dev/null
+++ b/source.local/kde/slack-desc/kde-runtime
@@ -0,0 +1,18 @@
+# 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------------------------------------------------------|
+kde-runtime: kde-runtime (KDE runtime core)
+kde-runtime:
+kde-runtime: This package contains core components of the KDE base runtime module.
+kde-runtime:
+kde-runtime:
+kde-runtime:
+kde-runtime:
+kde-runtime:
+kde-runtime:
+kde-runtime:
+kde-runtime:
diff --git a/source.local/kde/slack-desc/kde-wallpapers b/source.local/kde/slack-desc/kde-wallpapers
new file mode 100644
index 0000000..e78fbfb
--- /dev/null
+++ b/source.local/kde/slack-desc/kde-wallpapers
@@ -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-------------------------------------------------|
+kde-wallpapers: kde-wallpapers (Wallpapers for KDE)
+kde-wallpapers:
+kde-wallpapers: Additional wallpapers for KDE.
+kde-wallpapers:
+kde-wallpapers:
+kde-wallpapers:
+kde-wallpapers:
+kde-wallpapers:
+kde-wallpapers:
+kde-wallpapers:
+kde-wallpapers:
diff --git a/source.local/kde/slack-desc/kde-workspace b/source.local/kde/slack-desc/kde-workspace
new file mode 100644
index 0000000..3027e73
--- /dev/null
+++ b/source.local/kde/slack-desc/kde-workspace
@@ -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------------------------------------------------------|
+kde-workspace: kde-workspace (KDE Plasma Desktop)
+kde-workspace:
+kde-workspace: This package provides the essential parts of the KDE Plasma Desktop
+kde-workspace: that are presented to the user.
+kde-workspace:
+kde-workspace:
+kde-workspace:
+kde-workspace:
+kde-workspace:
+kde-workspace:
+kde-workspace:
diff --git a/source.local/kde/slack-desc/kdeaccessibility b/source.local/kde/slack-desc/kdeaccessibility
new file mode 100644
index 0000000..91669ef
--- /dev/null
+++ b/source.local/kde/slack-desc/kdeaccessibility
@@ -0,0 +1,20 @@
+# 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------------------------------------------------------|
+kdeaccessibility: kdeaccessibility (Accessibility programs for KDE)
+kdeaccessibility:
+kdeaccessibility: KDE accessibility programs, including kmag (a screen magnifier),
+kdeaccessibility: kmousetool (clicks the mouse for you), and kmouth (a speech
+kdeaccessibility: synthesizer frontend).
+kdeaccessibility:
+kdeaccessibility:
+kdeaccessibility:
+kdeaccessibility:
+kdeaccessibility:
+kdeaccessibility:
+kdeaccessibility:
diff --git a/source.local/kde/slack-desc/kdeadmin b/source.local/kde/slack-desc/kdeadmin
new file mode 100644
index 0000000..cef4307
--- /dev/null
+++ b/source.local/kde/slack-desc/kdeadmin
@@ -0,0 +1,20 @@
+
+# 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---------------------------------------------------|
+kdeadmin: kdeadmin (System Administration tools)
+kdeadmin:
+kdeadmin: KDE system administration tools.
+kdeadmin:
+kdeadmin:
+kdeadmin:
+kdeadmin:
+kdeadmin:
+kdeadmin:
+kdeadmin:
+kdeadmin:
diff --git a/source.local/kde/slack-desc/kdeartwork b/source.local/kde/slack-desc/kdeartwork
new file mode 100644
index 0000000..cc5f6f1
--- /dev/null
+++ b/source.local/kde/slack-desc/kdeartwork
@@ -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-------------------------------------------------|
+kdeartwork: kdeartwork (Artwork for KDE)
+kdeartwork:
+kdeartwork: Additional themes, screensavers, sounds, wallpapers, and window
+kdeartwork: styles.
+kdeartwork:
+kdeartwork:
+kdeartwork:
+kdeartwork:
+kdeartwork:
+kdeartwork:
+kdeartwork:
diff --git a/source.local/kde/slack-desc/kdebase b/source.local/kde/slack-desc/kdebase
new file mode 100644
index 0000000..bf91423
--- /dev/null
+++ b/source.local/kde/slack-desc/kdebase
@@ -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------------------------------------------------------|
+kdebase: kdebase (KDE core applications and files)
+kdebase:
+kdebase: This package provides the core applications and infrastructure files
+kdebase: for the KDE Plasma Desktop.
+kdebase:
+kdebase:
+kdebase:
+kdebase:
+kdebase:
+kdebase:
+kdebase:
diff --git a/source.local/kde/slack-desc/kdebase-runtime b/source.local/kde/slack-desc/kdebase-runtime
new file mode 100644
index 0000000..09bf577
--- /dev/null
+++ b/source.local/kde/slack-desc/kdebase-runtime
@@ -0,0 +1,18 @@
+# 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------------------------------------------------------|
+kdebase-runtime: kdebase-runtime (KDE runtime core)
+kdebase-runtime:
+kdebase-runtime: This package contains core components of the KDE base runtime module.
+kdebase-runtime:
+kdebase-runtime:
+kdebase-runtime:
+kdebase-runtime:
+kdebase-runtime:
+kdebase-runtime:
+kdebase-runtime:
+kdebase-runtime:
diff --git a/source.local/kde/slack-desc/kdebase-workspace b/source.local/kde/slack-desc/kdebase-workspace
new file mode 100644
index 0000000..2ec1141
--- /dev/null
+++ b/source.local/kde/slack-desc/kdebase-workspace
@@ -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------------------------------------------------------|
+kdebase-workspace: kdebase-workspace (KDE Plasma Desktop)
+kdebase-workspace:
+kdebase-workspace: This package provides the essential parts of the KDE Plasma Desktop
+kdebase-workspace: that are presented to the user.
+kdebase-workspace:
+kdebase-workspace:
+kdebase-workspace:
+kdebase-workspace:
+kdebase-workspace:
+kdebase-workspace:
+kdebase-workspace:
diff --git a/source.local/kde/slack-desc/kdebindings b/source.local/kde/slack-desc/kdebindings
new file mode 100644
index 0000000..e927c76
--- /dev/null
+++ b/source.local/kde/slack-desc/kdebindings
@@ -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------------------------------------------------------|
+kdebindings: kdebindings (KDE language bindings)
+kdebindings:
+kdebindings: KDE and most KDE applications are implemented using the C++
+kdebindings: programming language, but that doesn't mean you don't have a choice.
+kdebindings: This package contains a number of bindings to other languages,
+kdebindings: including scripting languages and other systems' programming
+kdebindings: languages, allowing them to be used to create applications for the
+kdebindings: KDE Platform.
+kdebindings:
+kdebindings:
+kdebindings:
diff --git a/source.local/kde/slack-desc/kdeedu b/source.local/kde/slack-desc/kdeedu
new file mode 100644
index 0000000..b97fdd7
--- /dev/null
+++ b/source.local/kde/slack-desc/kdeedu
@@ -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------------------------------------------------------|
+kdeedu: kdeedu (Educational applications)
+kdeedu:
+kdeedu: Educational applications for the KDE Software Compilation.
+kdeedu:
+kdeedu:
+kdeedu:
+kdeedu:
+kdeedu:
+kdeedu:
+kdeedu:
+kdeedu:
diff --git a/source.local/kde/slack-desc/kdegames b/source.local/kde/slack-desc/kdegames
new file mode 100644
index 0000000..c821c7f
--- /dev/null
+++ b/source.local/kde/slack-desc/kdegames
@@ -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------------------------------------------------------|
+kdegames: kdegames (KDE games)
+kdegames:
+kdegames: A collection of games for the KDE Software Compilation.
+kdegames:
+kdegames:
+kdegames:
+kdegames:
+kdegames:
+kdegames:
+kdegames:
+kdegames:
diff --git a/source.local/kde/slack-desc/kdegraphics b/source.local/kde/slack-desc/kdegraphics
new file mode 100644
index 0000000..7184942
--- /dev/null
+++ b/source.local/kde/slack-desc/kdegraphics
@@ -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------------------------------------------------------|
+kdegraphics: kdegraphics (KDE graphics programs)
+kdegraphics:
+kdegraphics: Graphics programs for the KDE Software Compilation, including
+kdegraphics: gwenview, kcolorchooser, kbackgroundsnapshot, kolourpaint, kruler,
+kdegraphics: ksnapshot, okular, and xf86gammacfg.
+kdegraphics:
+kdegraphics:
+kdegraphics:
+kdegraphics:
+kdegraphics:
+kdegraphics:
diff --git a/source.local/kde/slack-desc/kdegraphics-mobipocket b/source.local/kde/slack-desc/kdegraphics-mobipocket
new file mode 100644
index 0000000..2704d36
--- /dev/null
+++ b/source.local/kde/slack-desc/kdegraphics-mobipocket
@@ -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------------------------------------------------------|
+kdegraphics-mobipocket: kdegraphics-mobipocket (Mobipocket support for Okular)
+kdegraphics-mobipocket:
+kdegraphics-mobipocket: Mobipocket support for Okular.
+kdegraphics-mobipocket:
+kdegraphics-mobipocket: For more information, visit:  http://www.kde.org/
+kdegraphics-mobipocket:
+kdegraphics-mobipocket:
+kdegraphics-mobipocket:
+kdegraphics-mobipocket:
+kdegraphics-mobipocket:
+kdegraphics-mobipocket:
diff --git a/source.local/kde/slack-desc/kdegraphics-strigi-analyzer b/source.local/kde/slack-desc/kdegraphics-strigi-analyzer
new file mode 100644
index 0000000..307e5aa
--- /dev/null
+++ b/source.local/kde/slack-desc/kdegraphics-strigi-analyzer
@@ -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------------------------------------------------------|
+kdegraphics-strigi-analyzer: kdegraphics-strigi-analyzer (graphics plugins for strigi)
+kdegraphics-strigi-analyzer:
+kdegraphics-strigi-analyzer: Graphics file format plugins for Strigi Desktop Search.
+kdegraphics-strigi-analyzer: These plugins allow Strigi Desktop Search to extract
+kdegraphics-strigi-analyzer: additional information about several document and graphic file
+kdegraphics-strigi-analyzer: formats.
+kdegraphics-strigi-analyzer:
+kdegraphics-strigi-analyzer: For more information, visit:  http://www.kde.org
+kdegraphics-strigi-analyzer:
+kdegraphics-strigi-analyzer:
+kdegraphics-strigi-analyzer:
diff --git a/source.local/kde/slack-desc/kdegraphics-thumbnailers b/source.local/kde/slack-desc/kdegraphics-thumbnailers
new file mode 100644
index 0000000..1f781d5
--- /dev/null
+++ b/source.local/kde/slack-desc/kdegraphics-thumbnailers
@@ -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------------------------------------------------------|
+kdegraphics-thumbnailers: kdegraphics-thumbnailers (thumbnailers for various graphics formats)
+kdegraphics-thumbnailers:
+kdegraphics-thumbnailers: These plugins allow KDE software to create thumbnails for
+kdegraphics-thumbnailers: several advanced graphic file formats.
+kdegraphics-thumbnailers:
+kdegraphics-thumbnailers: For more information, visit:  http://www.kde.org
+kdegraphics-thumbnailers:
+kdegraphics-thumbnailers:
+kdegraphics-thumbnailers:
+kdegraphics-thumbnailers:
+kdegraphics-thumbnailers:
diff --git a/source.local/kde/slack-desc/kdelibs b/source.local/kde/slack-desc/kdelibs
new file mode 100644
index 0000000..a89ea3c
--- /dev/null
+++ b/source.local/kde/slack-desc/kdelibs
@@ -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------------------------------------------------------|
+kdelibs: kdelibs (KDE libraries)
+kdelibs:
+kdelibs: System libraries and other resources required for the KDE Platform.
+kdelibs:
+kdelibs:
+kdelibs:
+kdelibs:
+kdelibs:
+kdelibs:
+kdelibs:
+kdelibs:
diff --git a/source.local/kde/slack-desc/kdemultimedia b/source.local/kde/slack-desc/kdemultimedia
new file mode 100644
index 0000000..cd05862
--- /dev/null
+++ b/source.local/kde/slack-desc/kdemultimedia
@@ -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------------------------------------------------------|
+kdemultimedia: kdemultimedia (KDE multimedia applications)
+kdemultimedia:
+kdemultimedia: Multimedia applications for the KDE Software Compilation.
+kdemultimedia:
+kdemultimedia:
+kdemultimedia:
+kdemultimedia:
+kdemultimedia:
+kdemultimedia:
+kdemultimedia:
+kdemultimedia:
diff --git a/source.local/kde/slack-desc/kdenetwork b/source.local/kde/slack-desc/kdenetwork
new file mode 100644
index 0000000..90120dd
--- /dev/null
+++ b/source.local/kde/slack-desc/kdenetwork
@@ -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------------------------------------------------------|
+kdenetwork: kdenetwork (Network utilities for KDE)
+kdenetwork:
+kdenetwork: Network related utilities for the KDE Software Compilation.
+kdenetwork:
+kdenetwork:
+kdenetwork:
+kdenetwork:
+kdenetwork:
+kdenetwork:
+kdenetwork:
+kdenetwork:
diff --git a/source.local/kde/slack-desc/kdepim b/source.local/kde/slack-desc/kdepim
new file mode 100644
index 0000000..7a66c17
--- /dev/null
+++ b/source.local/kde/slack-desc/kdepim
@@ -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-----------------------------------------------------|
+kdepim: kdepim (KDE Personal Information Management applications)
+kdepim:
+kdepim: The KDE-PIM project aims to bring together those who wish to help 
+kdepim: design, implement, test, etc. anything that's to do with personal 
+kdepim: information management.
+kdepim:
+kdepim: This rather broad scope encompasses mail clients, addressbooks, 
+kdepim: usenet news, scheduling, and even sticky notes.
+kdepim:
+kdepim:
+kdepim:
diff --git a/source.local/kde/slack-desc/kdepim-runtime b/source.local/kde/slack-desc/kdepim-runtime
new file mode 100644
index 0000000..cb0ac6e
--- /dev/null
+++ b/source.local/kde/slack-desc/kdepim-runtime
@@ -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-----------------------------------------------------|
+kdepim-runtime: kdepim-runtime (KDE Personal Information Management runtime)
+kdepim-runtime:
+kdepim-runtime: The KDE-PIM project aims to bring together those who wish to help 
+kdepim-runtime: design, implement, test, etc. anything that's to do with personal 
+kdepim-runtime: information management.
+kdepim-runtime:
+kdepim-runtime: This rather broad scope encompasses mail clients, addressbooks, 
+kdepim-runtime: usenet news, scheduling, and even sticky notes.
+kdepim-runtime:
+kdepim-runtime:
+kdepim-runtime:
diff --git a/source.local/kde/slack-desc/kdepimlibs b/source.local/kde/slack-desc/kdepimlibs
new file mode 100644
index 0000000..cbd08ba
--- /dev/null
+++ b/source.local/kde/slack-desc/kdepimlibs
@@ -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------------------------------------------------------|
+kdepimlibs: kdepimlibs (Libraries for KDE-PIM)
+kdepimlibs:
+kdepimlibs: This module includes libraries that are central to the development and
+kdepimlibs: execution of a KDE-PIM application.
+kdepimlibs:
+kdepimlibs:
+kdepimlibs:
+kdepimlibs:
+kdepimlibs:
+kdepimlibs:
+kdepimlibs:
diff --git a/source.local/kde/slack-desc/kdeplasma-addons b/source.local/kde/slack-desc/kdeplasma-addons
new file mode 100644
index 0000000..a9bc573
--- /dev/null
+++ b/source.local/kde/slack-desc/kdeplasma-addons
@@ -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------------------------------------------------------|
+kdeplasma-addons: kdeplasma-addons (Plasma addons for KDE)
+kdeplasma-addons:
+kdeplasma-addons: Plasmoids (or widgets) for the KDE Plasma Desktop shell.
+kdeplasma-addons:
+kdeplasma-addons:
+kdeplasma-addons:
+kdeplasma-addons:
+kdeplasma-addons:
+kdeplasma-addons:
+kdeplasma-addons:
+kdeplasma-addons:
diff --git a/source.local/kde/slack-desc/kdesdk b/source.local/kde/slack-desc/kdesdk
new file mode 100644
index 0000000..f954a27
--- /dev/null
+++ b/source.local/kde/slack-desc/kdesdk
@@ -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-----------------------------------------------------|
+kdesdk: kdesdk (KDE SDK)
+kdesdk:
+kdesdk: KDE Software Development Kit.  This is a collection of applications
+kdesdk: and tools used to develop on the KDE Platform.  It also contains
+kdesdk: example code for use in learning KDE programming or starting a new
+kdesdk: KDE application.
+kdesdk:
+kdesdk:
+kdesdk:
+kdesdk:
+kdesdk:
diff --git a/source.local/kde/slack-desc/kdetoys b/source.local/kde/slack-desc/kdetoys
new file mode 100644
index 0000000..9af6c60
--- /dev/null
+++ b/source.local/kde/slack-desc/kdetoys
@@ -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------------------------------------------------------|
+kdetoys: kdetoys (Toys for the KDE Software Compilation)
+kdetoys:
+kdetoys: Some toys for the KDE Software Compilation such as amor, kteatime,
+kdetoys: ktux, kweatherreport, and kweatherservice.
+kdetoys:
+kdetoys:
+kdetoys:
+kdetoys:
+kdetoys:
+kdetoys:
+kdetoys:
diff --git a/source.local/kde/slack-desc/kdeutils b/source.local/kde/slack-desc/kdeutils
new file mode 100644
index 0000000..927ac43
--- /dev/null
+++ b/source.local/kde/slack-desc/kdeutils
@@ -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---------------------------------------------------|
+kdeutils: kdeutils (KDE Utilities)
+kdeutils:
+kdeutils: This package includes utilities for the KDE Software Compilation.
+kdeutils:
+kdeutils:
+kdeutils:
+kdeutils:
+kdeutils:
+kdeutils:
+kdeutils:
+kdeutils:
diff --git a/source.local/kde/slack-desc/kdevelop b/source.local/kde/slack-desc/kdevelop
new file mode 100644
index 0000000..49f2da1
--- /dev/null
+++ b/source.local/kde/slack-desc/kdevelop
@@ -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------------------------------------------------------|
+kdevelop: kdevelop (development environment for KDE)
+kdevelop:
+kdevelop: The KDevelop integrated C/C++ application development environment.
+kdevelop:
+kdevelop:
+kdevelop:
+kdevelop:
+kdevelop:
+kdevelop:
+kdevelop:
+kdevelop:
diff --git a/source.local/kde/slack-desc/kdevelop-pg-qt b/source.local/kde/slack-desc/kdevelop-pg-qt
new file mode 100644
index 0000000..3b158dd
--- /dev/null
+++ b/source.local/kde/slack-desc/kdevelop-pg-qt
@@ -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------------------------------------------------------|
+kdevelop-pg-qt: kdevelop-pg-qt (KDevelop Parser Generator)
+kdevelop-pg-qt:
+kdevelop-pg-qt: KDevelop Parser Generator used in the PHP language plugin and others.
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
diff --git a/source.local/kde/slack-desc/kdevplatform b/source.local/kde/slack-desc/kdevplatform
new file mode 100644
index 0000000..04fe68c
--- /dev/null
+++ b/source.local/kde/slack-desc/kdevplatform
@@ -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------------------------------------------------------|
+kdevplatform: kdevplatform (KDE development platform)
+kdevplatform:
+kdevplatform: This KDE module provides libraries used by kdevelop.
+kdevplatform:
+kdevplatform:
+kdevplatform:
+kdevplatform:
+kdevplatform:
+kdevplatform:
+kdevplatform:
+kdevplatform:
diff --git a/source.local/kde/slack-desc/kdewebdev b/source.local/kde/slack-desc/kdewebdev
new file mode 100644
index 0000000..294ef22
--- /dev/null
+++ b/source.local/kde/slack-desc/kdewebdev
@@ -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--------------------------------------------------|
+kdewebdev: kdewebdev (web development package for the KDE Platform)
+kdewebdev:
+kdewebdev: The kdewebdev package contains applications which are useful for
+kdewebdev: web development.
+kdewebdev:
+kdewebdev:
+kdewebdev:
+kdewebdev:
+kdewebdev:
+kdewebdev:
+kdewebdev:
diff --git a/source.local/kde/slack-desc/kdf b/source.local/kde/slack-desc/kdf
new file mode 100644
index 0000000..896ade4
--- /dev/null
+++ b/source.local/kde/slack-desc/kdf
@@ -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 mkdiskfrees 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------------------------------------------------------|
+kdf: kdf (show available disk space)
+kdf:
+kdf: kdf (KDiskFree) displays the available file devices (hard drive
+kdf: partitions, floppy and CD/DVD drives, etc.) along with information on
+kdf: their capacity, free space, type and mount point.
+kdf:
+kdf: kdf's home page is:  http://utils.kde.org/projects/kdf
+kdf:
+kdf:
+kdf:
+kdf:
diff --git a/source.local/kde/slack-desc/kdiamond b/source.local/kde/slack-desc/kdiamond
new file mode 100644
index 0000000..4c2c7cc
--- /dev/null
+++ b/source.local/kde/slack-desc/kdiamond
@@ -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------------------------------------------------------|
+kdiamond: kdiamond (three-in-a-row game for KDE)
+kdiamond:
+kdiamond: KDiamond is a single player puzzle game.  The object of the game is
+kdiamond: to build and remove lines of three similar diamonds.
+kdiamond:
+kdiamond:
+kdiamond:
+kdiamond:
+kdiamond:
+kdiamond: For more information, visit:  http://www.kde.org
+kdiamond:
diff --git a/source.local/kde/slack-desc/kfloppy b/source.local/kde/slack-desc/kfloppy
new file mode 100644
index 0000000..761f227
--- /dev/null
+++ b/source.local/kde/slack-desc/kfloppy
@@ -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 mkfloppys 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------------------------------------------------------|
+kfloppy: kfloppy (floppy disk formatter)
+kfloppy:
+kfloppy: KFloppy is a utility that provides a straightforward graphical means
+kfloppy: to format 3.5" and 5.25" floppy disks.
+kfloppy:
+kfloppy: kfloppy's home page is:  http://utils.kde.org/projects/kfloppy
+kfloppy:
+kfloppy:
+kfloppy:
+kfloppy:
+kfloppy:
diff --git a/source.local/kde/slack-desc/kfourinline b/source.local/kde/slack-desc/kfourinline
new file mode 100644
index 0000000..78b18d8
--- /dev/null
+++ b/source.local/kde/slack-desc/kfourinline
@@ -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------------------------------------------------------|
+kfourinline: kfourinline (four-in-a-row board game)
+kfourinline:
+kfourinline: KFourInLine is a board game for two players based on the
+kfourinline: Connect-Four game.  The players try to build up a row of
+kfourinline: four pieces using different strategies.
+kfourinline:
+kfourinline:
+kfourinline:
+kfourinline:
+kfourinline: For more information, visit:  http://www.kde.org
+kfourinline:
diff --git a/source.local/kde/slack-desc/kgamma b/source.local/kde/slack-desc/kgamma
new file mode 100644
index 0000000..be461c5
--- /dev/null
+++ b/source.local/kde/slack-desc/kgamma
@@ -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------------------------------------------------------|
+kgamma: kgamma (display gamma configuration)
+kgamma:
+kgamma: A KDE system settings module to configure display gamma.
+kgamma:
+kgamma: For more information, visit:  http://www.kde.org
+kgamma:
+kgamma:
+kgamma:
+kgamma:
+kgamma:
+kgamma:
diff --git a/source.local/kde/slack-desc/kgeography b/source.local/kde/slack-desc/kgeography
new file mode 100644
index 0000000..cb03bc5
--- /dev/null
+++ b/source.local/kde/slack-desc/kgeography
@@ -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------------------------------------------------------|
+kgeography: kgeography (a geography learning tool)
+kgeography:
+kgeography: KGeography is a geography learning tool.
+kgeography: Right now it has three usage modes:
+kgeography: * Browse the maps clicking in a map division to see it's name
+kgeography: * The game tells you a map division name and you have to click on it
+kgeography: * The game shows you a map division flag and you have to guess
+kgeography:   its name 
+kgeography:
+kgeography: For more information, visit:  http://kgeography.berlios.de/
+kgeography:
diff --git a/source.local/kde/slack-desc/kgoldrunner b/source.local/kde/slack-desc/kgoldrunner
new file mode 100644
index 0000000..6b067c1
--- /dev/null
+++ b/source.local/kde/slack-desc/kgoldrunner
@@ -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------------------------------------------------------|
+kgoldrunner: kgoldrunner (Hunt gold, dodge enemies and solve puzzles)
+kgoldrunner:
+kgoldrunner: KGoldrunner is a maze-threading game with a puzzle flavor.
+kgoldrunner: It has hundreds of levels where pieces of gold must be collected,
+kgoldrunner: with enemies in hot pursuit.
+kgoldrunner:
+kgoldrunner:
+kgoldrunner:
+kgoldrunner:
+kgoldrunner: For more information, visit:  http://www.kde.org
+kgoldrunner:
diff --git a/source.local/kde/slack-desc/kgpg b/source.local/kde/slack-desc/kgpg
new file mode 100644
index 0000000..51975cd
--- /dev/null
+++ b/source.local/kde/slack-desc/kgpg
@@ -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 mkgpgs 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------------------------------------------------------|
+kgpg: kgpg (KDE GUI for GnuPG)
+kgpg:
+kgpg: KGpg is a simple interface for GnuPG, a powerful encryption utility.
+kgpg:
+kgpg: kgpg's home page is:  http://utils.kde.org/projects/kgpg
+kgpg:
+kgpg:
+kgpg:
+kgpg:
+kgpg:
+kgpg:
diff --git a/source.local/kde/slack-desc/khangman b/source.local/kde/slack-desc/khangman
new file mode 100644
index 0000000..eaf9a85
--- /dev/null
+++ b/source.local/kde/slack-desc/khangman
@@ -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------------------------------------------------------|
+khangman: khangman (classical hangman game)
+khangman:
+khangman: KHangman is the classical hangman game. The child should guess a word
+khangman: letter by letter.  At each miss, the picture of a hangman appears.
+khangman: After 10 tries, if the word is not guessed, the game is over and
+khangman: the answer is displayed.
+khangman:
+khangman: For more information, visit:  http://edu.kde.org/
+khangman:
+khangman:
+khangman:
diff --git a/source.local/kde/slack-desc/kig b/source.local/kde/slack-desc/kig
new file mode 100644
index 0000000..062fa2b
--- /dev/null
+++ b/source.local/kde/slack-desc/kig
@@ -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------------------------------------------------------|
+kig: kig (interactive geometry game)
+kig:
+kig: Kig is an application meant to allow high school students to
+kig: interactively explore mathematical concepts, much like Dr.Geo, KGeo,
+kig: KSeg and Cabri.
+kig:
+kig: For more information, visit:  http://edu.kde.org/kig/
+kig:
+kig:
+kig:
+kig:
diff --git a/source.local/kde/slack-desc/kigo b/source.local/kde/slack-desc/kigo
new file mode 100644
index 0000000..3939e01
--- /dev/null
+++ b/source.local/kde/slack-desc/kigo
@@ -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------------------------------------------------------|
+kigo: kigo (Go board game for KDE)
+kigo:
+kigo: Kigo is an open-source implementation of the popular Go game.
+kigo: Go is a strategic board game for two players. It is also known as igo
+kigo: (Japanese), weiqi or wei ch'i (Chinese) or baduk (Korean). Go is noted
+kigo: for being rich in strategic complexity despite its simple rules.
+kigo: The game is played by two players who alternately place black and
+kigo: white pieces on the vacant intersections of a grid of 19x19 lines
+kigo: (9x9 or 13x13 for easier games).
+kigo:
+kigo: For more information, visit:  http://www.kde.org
diff --git a/source.local/kde/slack-desc/killbots b/source.local/kde/slack-desc/killbots
new file mode 100644
index 0000000..6acee05
--- /dev/null
+++ b/source.local/kde/slack-desc/killbots
@@ -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------------------------------------------------------|
+killbots: killbots (Robots-like game for KDE)
+killbots:
+killbots: Killbots is a simple game of evading killer robots.
+killbots:
+killbots:
+killbots:
+killbots:
+killbots:
+killbots:
+killbots: For more information, visit:  http://www.kde.org
+killbots:
diff --git a/source.local/kde/slack-desc/kimono b/source.local/kde/slack-desc/kimono
new file mode 100644
index 0000000..76c2f2f
--- /dev/null
+++ b/source.local/kde/slack-desc/kimono
@@ -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------------------------------------------------------|
+kimono: kimono (C# mono KDE4 bindings)
+kimono:
+kimono: C# Mono KDE 4 language bindings.
+kimono:
+kimono: For more information, visit:  http://www.www.org
+kimono:
+kimono:
+kimono:
+kimono:
+kimono:
+kimono:
diff --git a/source.local/kde/slack-desc/kio-mtp b/source.local/kde/slack-desc/kio-mtp
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/source.local/kde/slack-desc/kio-mtp
@@ -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------------------------------------------------------|
+kio-mtp: kio-mtp (Provides KIO Access to MTP devices)
+kio-mtp:
+kio-mtp: Provides KIO Access to MTP devices using the mtp:/// protocol.
+kio-mtp: MTP stands for Media Transfer Protocol”  It is required in order to
+kio-mtp: access and manage files on devices running Android 4.0 and later.
+kio-mtp:
+kio-mtp:
+kio-mtp: Kio-mtp has been developed by Philipp Schmidt.
+kio-mtp:
+kio-mtp: For more information, visit:  http://www.kde.org
+kio-mtp:
diff --git a/source.local/kde/slack-desc/kipi-plugins b/source.local/kde/slack-desc/kipi-plugins
new file mode 100644
index 0000000..58fc361
--- /dev/null
+++ b/source.local/kde/slack-desc/kipi-plugins
@@ -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------------------------------------------------------|
+kipi-plugins: Kipi Plugins (Plugins for libKipi)
+kipi-plugins:
+kipi-plugins: Kipi Plugins are additional functions for the KDE Images Managment
+kipi-plugins: Host Programs (digiKam, KimDaBa, ShowImg, and Gwenview). They can add
+kipi-plugins: extra menus and shortcuts, and extend the host programs features. You
+kipi-plugins: can install as many or as few as you like, from within host programs.
+kipi-plugins:
+kipi-plugins: Homepage: http://www.kipi-plugins.org/
+kipi-plugins:
+kipi-plugins:
+kipi-plugins:
diff --git a/source.local/kde/slack-desc/kiriki b/source.local/kde/slack-desc/kiriki
new file mode 100644
index 0000000..cc09bbf
--- /dev/null
+++ b/source.local/kde/slack-desc/kiriki
@@ -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------------------------------------------------------|
+kiriki: kiriki (yahtzee-like dice game for KDE)
+kiriki:
+kiriki: Kiriki is an addictive and fun dice game for KDE, designed to be
+kiriki: played by as many as six players.  Participants have to collect points
+kiriki: by rolling five dice for up to three times per single turn. 
+kiriki:
+kiriki:
+kiriki:
+kiriki:
+kiriki: For more information, visit:  http://www.kde.org
+kiriki:
diff --git a/source.local/kde/slack-desc/kiten b/source.local/kde/slack-desc/kiten
new file mode 100644
index 0000000..a2a60f4
--- /dev/null
+++ b/source.local/kde/slack-desc/kiten
@@ -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------------------------------------------------------|
+kiten: kiten (a tool to learn Japanese)
+kiten:
+kiten: Kiten is a tool to learn Japanese.
+kiten:
+kiten: For more information, visit:  http://edu.kde.org/
+kiten:
+kiten:
+kiten:
+kiten:
+kiten:
+kiten:
diff --git a/source.local/kde/slack-desc/kjumpingcube b/source.local/kde/slack-desc/kjumpingcube
new file mode 100644
index 0000000..e8646f9
--- /dev/null
+++ b/source.local/kde/slack-desc/kjumpingcube
@@ -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------------------------------------------------------|
+kjumpingcube: kjumpingcube (territory capture game)
+kjumpingcube:
+kjumpingcube: KJumpingcube is a simple dice driven tactical game.
+kjumpingcube: The playing area consists of squares containing points.
+kjumpingcube: Players move by clicking on either a vacant square,
+kjumpingcube: or on one of their own squares. 
+kjumpingcube:
+kjumpingcube:
+kjumpingcube:
+kjumpingcube: For more information, visit:  http://www.kde.org
+kjumpingcube:
diff --git a/source.local/kde/slack-desc/klettres b/source.local/kde/slack-desc/klettres
new file mode 100644
index 0000000..d1bb370
--- /dev/null
+++ b/source.local/kde/slack-desc/klettres
@@ -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------------------------------------------------------|
+klettres: klettres (language learning program)
+klettres:
+klettres: KLettres aims to help to learn the alphabet and then to read some
+klettres: syllables in different languages.
+klettres: It is meant to help learning the very first sounds of a new language,
+klettres: for children or for adults.
+klettres:
+klettres: For more information, visit:  http://edu.kde.org/klettres
+klettres:
+klettres:
+klettres:
diff --git a/source.local/kde/slack-desc/klickety b/source.local/kde/slack-desc/klickety
new file mode 100644
index 0000000..e35b2a3
--- /dev/null
+++ b/source.local/kde/slack-desc/klickety
@@ -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------------------------------------------------------|
+klickety: klickety (strategy game)
+klickety:
+klickety: Klickety is a strategy game for KDE, an adaption of the Clickomania
+klickety: game.
+klickety: The rules are similar to those of the Same game: your goal is to clear
+klickety: the board by clicking on groups to destroy them.
+klickety:
+klickety:
+klickety:
+klickety: For more information, visit:  http://www.kde.org
+klickety:
diff --git a/source.local/kde/slack-desc/klines b/source.local/kde/slack-desc/klines
new file mode 100644
index 0000000..193eee1
--- /dev/null
+++ b/source.local/kde/slack-desc/klines
@@ -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------------------------------------------------------|
+klines: klines (tactical game for KDE)
+klines:
+klines: KLines is a simple but highly addictive, one player game for KDE.
+klines: KLines has been inspired by well known game of Color Lines, written
+klines: by Olga Demina, Igor Ivkin and Gennady Denisov back in 1992.
+klines: You can also play an online demo version of this game. 
+klines:
+klines:
+klines:
+klines: For more information, visit:  http://www.kde.org
+klines:
diff --git a/source.local/kde/slack-desc/kmag b/source.local/kde/slack-desc/kmag
new file mode 100644
index 0000000..b054802
--- /dev/null
+++ b/source.local/kde/slack-desc/kmag
@@ -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------------------------------------------------------|
+kmag: kmag (Screen magnifier)
+kmag:
+kmag: Magnifies a part of your screen.
+kmag:
+kmag: For more information, visit:  http://www.kde.org
+kmag:
+kmag:
+kmag:
+kmag:
+kmag:
+kmag:
diff --git a/source.local/kde/slack-desc/kmahjongg b/source.local/kde/slack-desc/kmahjongg
new file mode 100644
index 0000000..cd653a9
--- /dev/null
+++ b/source.local/kde/slack-desc/kmahjongg
@@ -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------------------------------------------------------|
+kmahjongg: kmahjongg (KDE port of Mahjongg game)
+kmahjongg:
+kmahjongg: KMahjongg is a clone of the well known tile based patience game of
+kmahjongg: the same name.  In the game you have to empty a game board filled
+kmahjongg: with pieces, by pairwise removal of pieces of the same type.
+kmahjongg:
+kmahjongg:
+kmahjongg:
+kmahjongg:
+kmahjongg: For more information, visit:  http://www.kde.org
+kmahjongg:
diff --git a/source.local/kde/slack-desc/kmines b/source.local/kde/slack-desc/kmines
new file mode 100644
index 0000000..16981d2
--- /dev/null
+++ b/source.local/kde/slack-desc/kmines
@@ -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------------------------------------------------------|
+kmines: kmines (minesweeper clone for KDE)
+kmines:
+kmines: KMines is the classic Minesweeper game. The idea is to uncover all
+kmines: the squares without blowing up any mines.  When a mine is blown up,
+kmines: the game is over. 
+kmines:
+kmines:
+kmines:
+kmines:
+kmines: For more information, visit:  http://www.kde.org
+kmines:
diff --git a/source.local/kde/slack-desc/kmix b/source.local/kde/slack-desc/kmix
new file mode 100644
index 0000000..0325cdb
--- /dev/null
+++ b/source.local/kde/slack-desc/kmix
@@ -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------------------------------------------------------|
+kmix: kmix (sound mixer)
+kmix:
+kmix: KMix is an application to allow you to change the volume of your
+kmix: sound card.  Though small, it is full-featured, and it supports
+kmix: several platforms and sound drivers.
+kmix:
+kmix:
+kmix:
+kmix:
+kmix: For more information, visit:  http://www.kde.org
+kmix:
diff --git a/source.local/kde/slack-desc/kmousetool b/source.local/kde/slack-desc/kmousetool
new file mode 100644
index 0000000..017c312
--- /dev/null
+++ b/source.local/kde/slack-desc/kmousetool
@@ -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------------------------------------------------------|
+kmousetool: kmousetool (Automatic mouse clicks)
+kmousetool:
+kmousetool: Clicks the mouse for you, reducing hand strain.
+kmousetool:
+kmousetool: For more information, visit:  http://www.kde.org
+kmousetool:
+kmousetool:
+kmousetool:
+kmousetool:
+kmousetool:
+kmousetool:
diff --git a/source.local/kde/slack-desc/kmouth b/source.local/kde/slack-desc/kmouth
new file mode 100644
index 0000000..8bdac0f
--- /dev/null
+++ b/source.local/kde/slack-desc/kmouth
@@ -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------------------------------------------------------|
+kmouth: kmouth (Speech synthesis frontend)
+kmouth:
+kmouth: The computer "speaks" the entered text for talking with people.
+kmouth:
+kmouth: For more information, visit:  http://www.kde.org
+kmouth:
+kmouth:
+kmouth:
+kmouth:
+kmouth:
+kmouth:
diff --git a/source.local/kde/slack-desc/kmplot b/source.local/kde/slack-desc/kmplot
new file mode 100644
index 0000000..91472c5
--- /dev/null
+++ b/source.local/kde/slack-desc/kmplot
@@ -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------------------------------------------------------|
+kmplot: kmplot (a mathematical function plotter)
+kmplot:
+kmplot: KmPlot is a mathematical function plotter for the KDE-Desktop.  
+kmplot: It has a built-in powerful parser. You can plot different functions
+kmplot: simultaneously and combine them into new functions. KmPlot supports
+kmplot: functions with parameters and functions in polar coordinates.
+kmplot: Several grid modes are possible.
+kmplot: Plots may be printed with high precision in correct scale.
+kmplot:
+kmplot: For more information, visit:  http://edu.kde.org/
+kmplot:
diff --git a/source.local/kde/slack-desc/knavalbattle b/source.local/kde/slack-desc/knavalbattle
new file mode 100644
index 0000000..a6058c5
--- /dev/null
+++ b/source.local/kde/slack-desc/knavalbattle
@@ -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------------------------------------------------------|
+knavalbattle: knavalbattle (KDE version of battleship game)
+knavalbattle:
+knavalbattle: KNavalBattle is a battleship game with built-in game server.
+knavalbattle: Ships are placed on a board which represents the sea.  Players try
+knavalbattle: to hit each others ships in turns without knowing where they are
+knavalbattle: placed.  The first player to destroy all ships wins the game. 
+knavalbattle:
+knavalbattle:
+knavalbattle:
+knavalbattle: For more information, visit:  http://www.kde.org
+knavalbattle:
diff --git a/source.local/kde/slack-desc/knetwalk b/source.local/kde/slack-desc/knetwalk
new file mode 100644
index 0000000..df4b9bb
--- /dev/null
+++ b/source.local/kde/slack-desc/knetwalk
@@ -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------------------------------------------------------|
+knetwalk: knetwalk (turn the board pieces to get computers connected)
+knetwalk:
+knetwalk: KNetwalk is a single player logic game.  Construct the network,
+knetwalk: connecting all the terminals to the server in the fewest turns
+knetwalk: possible.
+knetwalk:
+knetwalk:
+knetwalk:
+knetwalk:
+knetwalk: For more information, visit:  http://www.kde.org
+knetwalk:
diff --git a/source.local/kde/slack-desc/koffice b/source.local/kde/slack-desc/koffice
new file mode 100644
index 0000000..6863e91
--- /dev/null
+++ b/source.local/kde/slack-desc/koffice
@@ -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------------------------------------------------------|
+koffice: koffice (KDE office productivity suite)
+koffice:
+koffice: KOffice office productivity applications.  Included are a word
+koffice: processor, spreadsheet, presentation program, chart and graph creator,
+koffice: vector graphics tool, database report creator, flowcharting program,
+koffice: integrated data management program, a pixel graphics editor,
+koffice: a mathematical formula editor, and KOffice Workspace
+koffice: (a combination of all of the above).
+koffice:
+koffice:
+koffice:
diff --git a/source.local/kde/slack-desc/kolf b/source.local/kde/slack-desc/kolf
new file mode 100644
index 0000000..a198a8b
--- /dev/null
+++ b/source.local/kde/slack-desc/kolf
@@ -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------------------------------------------------------|
+kolf: kolf (miniature golf game for KDE)
+kolf:
+kolf: Kolf is a miniature golf game. The game is played from an overhead
+kolf: view, with a short bar representing the golf club.  Kolf features many
+kolf: different types of objects, such water hazards, slopes, sand traps,
+kolf: and black holes (warps), among others.
+kolf:
+kolf:
+kolf:
+kolf: For more information, visit:  http://www.kde.org
+kolf:
diff --git a/source.local/kde/slack-desc/kollision b/source.local/kde/slack-desc/kollision
new file mode 100644
index 0000000..e0b4a2a
--- /dev/null
+++ b/source.local/kde/slack-desc/kollision
@@ -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------------------------------------------------------|
+kollision: kollision (simple ball dodging game)
+kollision:
+kollision: Kollision is a simple ball dodging game.
+kollision:
+kollision:
+kollision:
+kollision:
+kollision:
+kollision:
+kollision: For more information, visit:  http://www.kde.org
+kollision:
diff --git a/source.local/kde/slack-desc/kolourpaint b/source.local/kde/slack-desc/kolourpaint
new file mode 100644
index 0000000..b641cec
--- /dev/null
+++ b/source.local/kde/slack-desc/kolourpaint
@@ -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------------------------------------------------------|
+kolourpaint: kolourpaint (easy to use paint program)
+kolourpaint:
+kolourpaint: KolourPaint is a easy-to-use paint program for KDE. It aims to be
+kolourpaint: conceptually simply to understand; providing a level of functionality
+kolourpaint: targeted towards the average user. It's designed for tasks like: 
+kolourpaint: * Painting - drawing diagrams and "finger painting".
+kolourpaint: * Image Manipulation - editing screenshots and photos, and
+kolourpaint:   applying effects
+kolourpaint: * Icon Editing - drawing clipart and logos with transparency.
+kolourpaint:
+kolourpaint: For more information, visit:  http://www.kde.org
diff --git a/source.local/kde/slack-desc/konquest b/source.local/kde/slack-desc/konquest
new file mode 100644
index 0000000..e26e474
--- /dev/null
+++ b/source.local/kde/slack-desc/konquest
@@ -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------------------------------------------------------|
+konquest: konquest (KDE version of Gnu-Lactic Konquest)
+konquest:
+konquest: This the KDE version of Gnu-Lactic Konquest, a multi-player
+konquest: strategy game.  The goal of the game is to expand your
+konquest: interstellar empire across the galaxy.
+konquest:
+konquest:
+konquest:
+konquest:
+konquest: For more information, visit:  http://www.kde.org
+konquest:
diff --git a/source.local/kde/slack-desc/konsole b/source.local/kde/slack-desc/konsole
new file mode 100644
index 0000000..31cfa2c
--- /dev/null
+++ b/source.local/kde/slack-desc/konsole
@@ -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-----------------------------------------------------|
+konsole: konsole (KDE's terminal emulator)
+konsole:
+konsole: Konsole is KDE's terminal emulator.
+konsole:
+konsole: Homepage: http://kde.org
+konsole:
+konsole:
+konsole:
+konsole:
+konsole:
+konsole:
diff --git a/source.local/kde/slack-desc/kopete-cryptography b/source.local/kde/slack-desc/kopete-cryptography
new file mode 100644
index 0000000..7529a8b
--- /dev/null
+++ b/source.local/kde/slack-desc/kopete-cryptography
@@ -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------------------------------------------------------|
+kopete-cryptography: kopete-cryptography (crypto support for kopete)
+kopete-cryptography:
+kopete-cryptography: Cryptographic support for Kopete, the KDE Instant Messenger.
+kopete-cryptography:
+kopete-cryptography:
+kopete-cryptography:
+kopete-cryptography:
+kopete-cryptography:
+kopete-cryptography:
+kopete-cryptography:
+kopete-cryptography:
diff --git a/source.local/kde/slack-desc/korundum b/source.local/kde/slack-desc/korundum
new file mode 100644
index 0000000..70abb6a
--- /dev/null
+++ b/source.local/kde/slack-desc/korundum
@@ -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------------------------------------------------------|
+korundum: korundum (KDE ruby bindings)
+korundum:
+korundum: Very complete bindings to both the KDE API and the Qt APIs.
+korundum: The Korundum package includes both a QtRuby Qt-only binding along
+korundum: with the full combined Qt/KDE one.
+korundum: The QtRuby package contains just Qt bindings with no dependencies
+korundum: on KDE.
+korundum:
+korundum: For more information, visit:  http://rubyforge.org/projects/korundum/
+korundum:
+korundum:
diff --git a/source.local/kde/slack-desc/kpat b/source.local/kde/slack-desc/kpat
new file mode 100644
index 0000000..08a8439
--- /dev/null
+++ b/source.local/kde/slack-desc/kpat
@@ -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------------------------------------------------------|
+kpat: kpat (patience card game for KDE)
+kpat:
+kpat: KPat (aka KPatience) is a relaxing card sorting game.  To win the game
+kpat: a player has to arrange a single deck of cards in certain order
+kpat: amongst each other.
+kpat:
+kpat:
+kpat:
+kpat:
+kpat: For more information, visit:  http://www.kde.org
+kpat:
diff --git a/source.local/kde/slack-desc/kplayer b/source.local/kde/slack-desc/kplayer
new file mode 100644
index 0000000..87605b2
--- /dev/null
+++ b/source.local/kde/slack-desc/kplayer
@@ -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------------------------------------------------------|
+kplayer: kplayer (KDE media player)
+kplayer:
+kplayer: KPlayer is a KDE multimedia player. With KPlayer you can easily play
+kplayer: a wide variety of video and audio files and streams using a rich and
+kplayer: friendly interface that follows KDE standards.
+kplayer: KPlayer will work out of the box if properly installed, and because
+kplayer: it uses MPlayer as the media playing backend, it will play virtually
+kplayer: any file or Internet stream.
+kplayer:
+kplayer: For more information, visit:  http://www.kde.org
+kplayer:
diff --git a/source.local/kde/slack-desc/kremotecontrol b/source.local/kde/slack-desc/kremotecontrol
new file mode 100644
index 0000000..4da69dd
--- /dev/null
+++ b/source.local/kde/slack-desc/kremotecontrol
@@ -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 mkremotecontrols 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------------------------------------------------------|
+kremotecontrol: kremotecontrol (remote control frontend)
+kremotecontrol:
+kremotecontrol: KRemoteControl (formerly known as KDELirc) is a KDE frontend for
+kremotecontrol: your remote controls.
+kremotecontrol:
+kremotecontrol: kremotecontrol's home page is:
+kremotecontrol:   http://utils.kde.org/projects/kremotecontrol
+kremotecontrol:
+kremotecontrol:
+kremotecontrol:
+kremotecontrol:
diff --git a/source.local/kde/slack-desc/kreversi b/source.local/kde/slack-desc/kreversi
new file mode 100644
index 0000000..fb6c5d3
--- /dev/null
+++ b/source.local/kde/slack-desc/kreversi
@@ -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------------------------------------------------------|
+kreversi: kreversi (reversi board game for KDE)
+kreversi:
+kreversi: KReversi is a simple one player strategy game played against the
+kreversi: computer.  If a player's piece is captured by an opposing player,
+kreversi: that piece is turned over to reveal the color of that player.
+kreversi: A winner is declared when one player has more pieces of his own color
+kreversi: on the board and there are no more possible moves. 
+kreversi:
+kreversi:
+kreversi: For more information, visit:  http://www.kde.org
+kreversi:
diff --git a/source.local/kde/slack-desc/kross-interpreters b/source.local/kde/slack-desc/kross-interpreters
new file mode 100644
index 0000000..27a15fc
--- /dev/null
+++ b/source.local/kde/slack-desc/kross-interpreters
@@ -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------------------------------------------------------|
+kross-interpreters: kross-interpreters (Kross interpreters)
+kross-interpreters:
+kross-interpreters: Set of interpreter plugins for the Kross archtecture in KDE.
+kross-interpreters:
+kross-interpreters: See also:  http://developer.kde.org/language-bindings/
+kross-interpreters:
+kross-interpreters:
+kross-interpreters:
+kross-interpreters:
+kross-interpreters:
+kross-interpreters:
diff --git a/source.local/kde/slack-desc/kruler b/source.local/kde/slack-desc/kruler
new file mode 100644
index 0000000..1383667
--- /dev/null
+++ b/source.local/kde/slack-desc/kruler
@@ -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------------------------------------------------------|
+kruler: kruler (a screen ruler for KDE)
+kruler:
+kruler: A screen ruler and color measurement tool for KDE.
+kruler:
+kruler: For more information, visit:  http://www.kde.org
+kruler:
+kruler:
+kruler:
+kruler:
+kruler:
+kruler:
diff --git a/source.local/kde/slack-desc/ksaneplugin b/source.local/kde/slack-desc/ksaneplugin
new file mode 100644
index 0000000..410dcfc
--- /dev/null
+++ b/source.local/kde/slack-desc/ksaneplugin
@@ -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------------------------------------------------------|
+ksaneplugin: ksaneplugin (scanning plugin using libksane)
+ksaneplugin:
+ksaneplugin: This is a KScan plugin that implements the scanning through libksane.
+ksaneplugin:
+ksaneplugin: For more information, visit:  http://www.kde.org
+ksaneplugin:
+ksaneplugin:
+ksaneplugin:
+ksaneplugin:
+ksaneplugin:
+ksaneplugin:
diff --git a/source.local/kde/slack-desc/kscd b/source.local/kde/slack-desc/kscd
new file mode 100644
index 0000000..c45699e
--- /dev/null
+++ b/source.local/kde/slack-desc/kscd
@@ -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------------------------------------------------------|
+kscd: kscd (CD player)
+kscd:
+kscd: KsCD is a small, fast, CDDB enabled audio CD player which supports
+kscd: multiple platforms.
+kscd:
+kscd:
+kscd:
+kscd:
+kscd:
+kscd: For more information, visit:  http://www.kde.org
+kscd:
diff --git a/source.local/kde/slack-desc/kscreen b/source.local/kde/slack-desc/kscreen
new file mode 100644
index 0000000..90f1d63
--- /dev/null
+++ b/source.local/kde/slack-desc/kscreen
@@ -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------------------------------------------------------|
+kscreen: kscreen (KDE screen management)
+kscreen:
+kscreen: KScreen is the new screen management software for KDE Plasma
+kscreen: Workspaces which tries to be as magic and automatic as possible
+kscreen: for users with basic needs and easy to configure for those
+kscreen: who want special setups. 
+kscreen:
+kscreen:
+kscreen: For more information, visit:
+kscreen:   http://community.kde.org/Solid/Projects/ScreenManagement
+kscreen:
diff --git a/source.local/kde/slack-desc/ksecrets b/source.local/kde/slack-desc/ksecrets
new file mode 100644
index 0000000..40d6564
--- /dev/null
+++ b/source.local/kde/slack-desc/ksecrets
@@ -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------------------------------------------------------|
+ksecrets: ksecrets (secrets management infrastructure)
+ksecrets:
+ksecrets: ksecretsservice is a secrets management infrastructure aiming to
+ksecrets: replace kwallet. 
+ksecrets:
+ksecrets: For more information, visit:
+ksecrets:   http://techbase.kde.org/Projects/Utils/ksecretsservice
+ksecrets:
+ksecrets:
+ksecrets:
+ksecrets:
diff --git a/source.local/kde/slack-desc/kshisen b/source.local/kde/slack-desc/kshisen
new file mode 100644
index 0000000..1af7d35
--- /dev/null
+++ b/source.local/kde/slack-desc/kshisen
@@ -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------------------------------------------------------|
+kshisen: kshisen (Shisen-Sho Mahjongg-like tile game)
+kshisen:
+kshisen: KShisen is a solitaire-like game played using the standard set of
+kshisen: Mahjong tiles.  Unlike Mahjong however, KShisen has only one layer
+kshisen: of scrambled tiles.
+kshisen:
+kshisen:
+kshisen:
+kshisen:
+kshisen: For more information, visit:  http://www.kde.org
+kshisen:
diff --git a/source.local/kde/slack-desc/ksirk b/source.local/kde/slack-desc/ksirk
new file mode 100644
index 0000000..1a0826d
--- /dev/null
+++ b/source.local/kde/slack-desc/ksirk
@@ -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------------------------------------------------------|
+ksirk: ksirk (KDE port of the board game risk)
+ksirk:
+ksirk: Ksirk is a KDE port of the board game risk.
+ksirk:
+ksirk:
+ksirk:
+ksirk:
+ksirk:
+ksirk:
+ksirk: For more information, visit:  http://www.kde.org
+ksirk:
diff --git a/source.local/kde/slack-desc/ksnakeduel b/source.local/kde/slack-desc/ksnakeduel
new file mode 100644
index 0000000..731a772
--- /dev/null
+++ b/source.local/kde/slack-desc/ksnakeduel
@@ -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------------------------------------------------------|
+ksnakeduel: ksnakeduel (simple snake duel game for KDE)
+ksnakeduel:
+ksnakeduel: KSnakeDuel is a simple snake duel game for KDE.  You can play
+ksnakeduel: KSnakeDuel against the computer or a friend.  The aim of the game is
+ksnakeduel: to live longer than your opponent.  To do that, avoid running into
+ksnakeduel: a wall, your own tail and that of your opponent. 
+ksnakeduel:
+ksnakeduel:
+ksnakeduel:
+ksnakeduel: For more information, visit:  http://www.kde.org
+ksnakeduel:
diff --git a/source.local/kde/slack-desc/ksnapshot b/source.local/kde/slack-desc/ksnapshot
new file mode 100644
index 0000000..56b278a
--- /dev/null
+++ b/source.local/kde/slack-desc/ksnapshot
@@ -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------------------------------------------------------|
+ksnapshot: ksnapshot (screen capture program)
+ksnapshot:
+ksnapshot: A screenshot utility for KDE.
+ksnapshot:
+ksnapshot: For more information, visit:  http://www.kde.org
+ksnapshot:
+ksnapshot:
+ksnapshot:
+ksnapshot:
+ksnapshot:
+ksnapshot:
diff --git a/source.local/kde/slack-desc/kspaceduel b/source.local/kde/slack-desc/kspaceduel
new file mode 100644
index 0000000..8a4435f
--- /dev/null
+++ b/source.local/kde/slack-desc/kspaceduel
@@ -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------------------------------------------------------|
+kspaceduel: kspaceduel (space arcade game)
+kspaceduel:
+kspaceduel: In KSpaceduel each of two possible players controls a satellite
+kspaceduel: spaceship orbiting the sun.  As the game progresses players have to
+kspaceduel: eliminate opponent's spacecraft.
+kspaceduel:
+kspaceduel:
+kspaceduel:
+kspaceduel:
+kspaceduel: For more information, visit:  http://www.kde.org
+kspaceduel:
diff --git a/source.local/kde/slack-desc/ksquares b/source.local/kde/slack-desc/ksquares
new file mode 100644
index 0000000..ed147ff
--- /dev/null
+++ b/source.local/kde/slack-desc/ksquares
@@ -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------------------------------------------------------|
+ksquares: ksquares (connect the dots to create squares)
+ksquares:
+ksquares: KSquares is a fun and exciting game for desktop environment.
+ksquares: The game is modeled after the well known pen and paper based
+ksquares: game of Dots and Boxes. 
+ksquares:
+ksquares:
+ksquares:
+ksquares:
+ksquares: For more information, visit:  http://www.kde.org
+ksquares:
diff --git a/source.local/kde/slack-desc/kstars b/source.local/kde/slack-desc/kstars
new file mode 100644
index 0000000..1e0062c
--- /dev/null
+++ b/source.local/kde/slack-desc/kstars
@@ -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------------------------------------------------------|
+kstars: kstars (a desktop planetarium)
+kstars:
+kstars: KStars is a desktop planetarium.
+kstars:
+kstars: For more information, visit:  http://edu.kde.org/
+kstars:
+kstars:
+kstars:
+kstars:
+kstars:
+kstars:
diff --git a/source.local/kde/slack-desc/ksudoku b/source.local/kde/slack-desc/ksudoku
new file mode 100644
index 0000000..530f9d7
--- /dev/null
+++ b/source.local/kde/slack-desc/ksudoku
@@ -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------------------------------------------------------|
+ksudoku: ksudoku (sudoku game)
+ksudoku:
+ksudoku: KSudoku is a logic-based symbol placement puzzle.
+ksudoku: The player has to fill a grid so that each column, row as well as
+ksudoku: each square block on the game field contains only one instance of
+ksudoku: each symbol.
+ksudoku:
+ksudoku:
+ksudoku:
+ksudoku: For more information, visit:  http://www.kde.org
+ksudoku:
diff --git a/source.local/kde/slack-desc/ktimer b/source.local/kde/slack-desc/ktimer
new file mode 100644
index 0000000..45b787c
--- /dev/null
+++ b/source.local/kde/slack-desc/ktimer
@@ -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 mktimers 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------------------------------------------------------|
+ktimer: ktimer (program scheduler)
+ktimer:
+ktimer: KTimer is a little tool to execute programs after some time.
+ktimer:
+ktimer: ktimer's home page is:  http://utils.kde.org/projects/ktimer
+ktimer:
+ktimer:
+ktimer:
+ktimer:
+ktimer:
+ktimer:
diff --git a/source.local/kde/slack-desc/ktorrent b/source.local/kde/slack-desc/ktorrent
new file mode 100644
index 0000000..afb3a20
--- /dev/null
+++ b/source.local/kde/slack-desc/ktorrent
@@ -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------------------------------------------------------|
+ktorrent: ktorrent (KDE BitTorrent program)
+ktorrent:
+ktorrent: KTorrent is a BitTorrent program with many features:
+ktorrent: Download torrent files (of course :-), upload and download speed
+ktorrent: capping, Internet searching, UDP trackers, port forwarding with UPnP,
+ktorrent: IP blocking, importing of partially or fully downloaded files,
+ktorrent: support for distributed hash tables, protocol encryption,
+ktorrent: bandwidth scheduling, and much more.
+ktorrent:
+ktorrent: KTorrent's developers are Joris Guisson and Ivan Vasic.
+ktorrent:
diff --git a/source.local/kde/slack-desc/ktouch b/source.local/kde/slack-desc/ktouch
new file mode 100644
index 0000000..74fdba1
--- /dev/null
+++ b/source.local/kde/slack-desc/ktouch
@@ -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------------------------------------------------------|
+ktouch: ktouch (touch typing tutor)
+ktouch:
+ktouch: A KDE program that helps you to learn and practice touch typing.
+ktouch:
+ktouch: For more information, visit:  http://edu.kde.org/
+ktouch:
+ktouch:
+ktouch:
+ktouch:
+ktouch:
+ktouch:
diff --git a/source.local/kde/slack-desc/ktuberling b/source.local/kde/slack-desc/ktuberling
new file mode 100644
index 0000000..b6386d6
--- /dev/null
+++ b/source.local/kde/slack-desc/ktuberling
@@ -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------------------------------------------------------|
+ktuberling: ktuberling (picture game for children)
+ktuberling:
+ktuberling: KTuberling a simple constructor game suitable for children and
+ktuberling: adults alike.  The idea of the game is based around a once popular
+ktuberling: doll making concept. 
+ktuberling:
+ktuberling:
+ktuberling:
+ktuberling:
+ktuberling: For more information, visit:  http://www.kde.org
+ktuberling:
diff --git a/source.local/kde/slack-desc/kturtle b/source.local/kde/slack-desc/kturtle
new file mode 100644
index 0000000..2fc0d35
--- /dev/null
+++ b/source.local/kde/slack-desc/kturtle
@@ -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------------------------------------------------------|
+kturtle: kturtle (Logo programming environment)
+kturtle:
+kturtle: KTurtle is an educational Logo programming environment.
+kturtle:
+kturtle: For more information, visit:  http://edu.kde.org/
+kturtle:
+kturtle:
+kturtle:
+kturtle:
+kturtle:
+kturtle:
diff --git a/source.local/kde/slack-desc/kubrick b/source.local/kde/slack-desc/kubrick
new file mode 100644
index 0000000..15bf1df
--- /dev/null
+++ b/source.local/kde/slack-desc/kubrick
@@ -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------------------------------------------------------|
+kubrick: kubrick (3-D game based on Rubik's Cube)
+kubrick:
+kubrick: Kubrick is a game based on the Rubik's Cube puzzle.  The cube sizes
+kubrick: range from 2x2x2 up to 6x6x6, or you can play with irregular "bricks"
+kubrick: such as 5x3x2 or "mats" such as 6x4x1 or 2x2x1.
+kubrick: The game has a selection of puzzles at several levels of difficulty,
+kubrick: as well as demos of pretty patterns and solution moves, or you can
+kubrick: make up your own puzzles. 
+kubrick:
+kubrick: For more information, visit:  http://www.kde.org
+kubrick:
diff --git a/source.local/kde/slack-desc/kwallet b/source.local/kde/slack-desc/kwallet
new file mode 100644
index 0000000..64fbcf4
--- /dev/null
+++ b/source.local/kde/slack-desc/kwallet
@@ -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 mkwallets 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------------------------------------------------------|
+kwallet: kwallet (KDE wallet manager)
+kwallet:
+kwallet: KDE Wallet Manager is a tool to manage your passwords under KDE.
+kwallet:
+kwallet: kwallet's home page is:
+kwallet:   https://projects.kde.org/projects/kde/kdeutils
+kwallet:
+kwallet:
+kwallet:
+kwallet:
+kwallet:
diff --git a/source.local/kde/slack-desc/kwebkitpart b/source.local/kde/slack-desc/kwebkitpart
new file mode 100644
index 0000000..3938c9d
--- /dev/null
+++ b/source.local/kde/slack-desc/kwebkitpart
@@ -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-----------------------------------------------------|
+kwebkitpart: kwebkitpart (WebKit browser component)
+kwebkitpart:
+kwebkitpart: KWebKitPart is a web browser component for KDE based on (Qt)WebKit.
+kwebkitpart: You can use it for example for browsing the web in Konqueror.
+kwebkitpart:
+kwebkitpart: Homepage:  http://kde-apps.org/content/show.php?content=127960
+kwebkitpart:
+kwebkitpart:
+kwebkitpart:
+kwebkitpart:
+kwebkitpart:
diff --git a/source.local/kde/slack-desc/kwordquiz b/source.local/kde/slack-desc/kwordquiz
new file mode 100644
index 0000000..629395f
--- /dev/null
+++ b/source.local/kde/slack-desc/kwordquiz
@@ -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------------------------------------------------------|
+kwordquiz: kwordquiz (a general purpose flash card program)
+kwordquiz:
+kwordquiz: KWordQuiz is a general purpose flash card program.
+kwordquiz: It can be used for vocabulary learning and many other subjects.
+kwordquiz:
+kwordquiz: For more information, visit:  http://edu.kde.org/
+kwordquiz:
+kwordquiz:
+kwordquiz:
+kwordquiz:
+kwordquiz:
diff --git a/source.local/kde/slack-desc/libkcddb b/source.local/kde/slack-desc/libkcddb
new file mode 100644
index 0000000..40f2950
--- /dev/null
+++ b/source.local/kde/slack-desc/libkcddb
@@ -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------------------------------------------------------|
+libkcddb: libkcddb (KDE CDDB retrieval library)
+libkcddb:
+libkcddb: A KDE CDDB retrieval library.
+libkcddb:
+libkcddb:
+libkcddb:
+libkcddb:
+libkcddb:
+libkcddb:
+libkcddb: For more information, visit:  http://www.kde.org
+libkcddb:
diff --git a/source.local/kde/slack-desc/libkcompactdisc b/source.local/kde/slack-desc/libkcompactdisc
new file mode 100644
index 0000000..67ce9c9
--- /dev/null
+++ b/source.local/kde/slack-desc/libkcompactdisc
@@ -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------------------------------------------------------|
+libkcompactdisc: libkcompactdisc (KDE library for playing & ripping CDs)
+libkcompactdisc:
+libkcompactdisc: A KDE library for playing & ripping CDs.
+libkcompactdisc:
+libkcompactdisc:
+libkcompactdisc:
+libkcompactdisc:
+libkcompactdisc:
+libkcompactdisc:
+libkcompactdisc: For more information, visit:  http://www.kde.org
+libkcompactdisc:
diff --git a/source.local/kde/slack-desc/libkdcraw b/source.local/kde/slack-desc/libkdcraw
new file mode 100644
index 0000000..4cf8dee
--- /dev/null
+++ b/source.local/kde/slack-desc/libkdcraw
@@ -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------------------------------------------------------|
+libkdcraw: libkdcraw (library wrapper around dcraw)
+libkdcraw:
+libkdcraw: Libkdcraw is a C++ interface around the dcraw binary program, used
+libkdcraw: to decode RAW picture files.
+libkdcraw:
+libkdcraw: For more information, visit:  http://www.kipi-plugins.org/
+libkdcraw:
+libkdcraw:
+libkdcraw:
+libkdcraw:
+libkdcraw:
diff --git a/source.local/kde/slack-desc/libkdeedu b/source.local/kde/slack-desc/libkdeedu
new file mode 100644
index 0000000..ab58c79
--- /dev/null
+++ b/source.local/kde/slack-desc/libkdeedu
@@ -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------------------------------------------------------|
+libkdeedu: libkdeedu (Educational applications)
+libkdeedu:
+libkdeedu: Educational applications for the KDE Software Compilation.
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
diff --git a/source.local/kde/slack-desc/libkdegames b/source.local/kde/slack-desc/libkdegames
new file mode 100644
index 0000000..d383885
--- /dev/null
+++ b/source.local/kde/slack-desc/libkdegames
@@ -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------------------------------------------------------|
+libkdegames: libkdegames (common code and data for many KDE games)
+libkdegames:
+libkdegames: Libkdegames contains common code and data for many KDE games.
+libkdegames:
+libkdegames:
+libkdegames:
+libkdegames:
+libkdegames:
+libkdegames:
+libkdegames: For more information, visit:  http://www.kde.org
+libkdegames:
diff --git a/source.local/kde/slack-desc/libkexiv2 b/source.local/kde/slack-desc/libkexiv2
new file mode 100644
index 0000000..7a20619
--- /dev/null
+++ b/source.local/kde/slack-desc/libkexiv2
@@ -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------------------------------------------------------|
+libkexiv2: libkexiv2 (wrapper library for exiv2 library)
+libkexiv2:
+libkexiv2: Libkexiv2 is a KDE wrapper around the Exiv2 library to manipulate
+libkexiv2: pictures' metadata.
+libkexiv2:
+libkexiv2: For more information, visit:  http://www.kipi-plugins.org/
+libkexiv2:
+libkexiv2:
+libkexiv2:
+libkexiv2:
+libkexiv2:
diff --git a/source.local/kde/slack-desc/libkipi b/source.local/kde/slack-desc/libkipi
new file mode 100644
index 0000000..c1098f9
--- /dev/null
+++ b/source.local/kde/slack-desc/libkipi
@@ -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------------------------------------------------------|
+libkipi: libKipi (KDE Image Plugin Interface)
+libkipi:
+libkipi: This package provides a generic KDE Image Plug-in Interface used by
+libkipi: some KDE image applications.
+libkipi: Plug-ins for this interface are in the kipi-plugins package.
+libkipi:
+libkipi: For more info, visit:  http://www.kipi-plugins.org/
+libkipi:
+libkipi:
+libkipi:
+libkipi:
diff --git a/source.local/kde/slack-desc/libkmahjongg b/source.local/kde/slack-desc/libkmahjongg
new file mode 100644
index 0000000..8851a3c
--- /dev/null
+++ b/source.local/kde/slack-desc/libkmahjongg
@@ -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------------------------------------------------------|
+libkmahjongg: libkmahjongg (library for rendering of Mahjongg tilesets)
+libkmahjongg:
+libkmahjongg: libkmahjongg is a library used by several KDE games for loading
+libkmahjongg: and rendering of Mahjongg tilesets.
+libkmahjongg:
+libkmahjongg:
+libkmahjongg:
+libkmahjongg:
+libkmahjongg:
+libkmahjongg: For more information, visit:  http://www.kde.org
+libkmahjongg:
diff --git a/source.local/kde/slack-desc/libksane b/source.local/kde/slack-desc/libksane
new file mode 100644
index 0000000..2146c3c
--- /dev/null
+++ b/source.local/kde/slack-desc/libksane
@@ -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------------------------------------------------------|
+libksane: libksane (KDE scan support interface)
+libksane:
+libksane: Libksane is a library to add scan support to KDE applications.
+libksane:
+libksane: For more information, visit:  http://www.kde.org
+libksane:
+libksane:
+libksane:
+libksane:
+libksane:
+libksane:
diff --git a/source.local/kde/slack-desc/libkscreen b/source.local/kde/slack-desc/libkscreen
new file mode 100644
index 0000000..d823209
--- /dev/null
+++ b/source.local/kde/slack-desc/libkscreen
@@ -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------------------------------------------------------|
+libkscreen: libkscreen (KDE screen management library)
+libkscreen:
+libkscreen: LibKScreen is a library that provides access to current configuration
+libkscreen: of connected displays and ways to change the configuration.
+libkscreen:
+libkscreen:
+libkscreen:
+libkscreen:
+libkscreen: For more information, visit:
+libkscreen:   http://community.kde.org/Solid/Projects/ScreenManagement
+libkscreen:
diff --git a/source.local/kde/slack-desc/libktorrent b/source.local/kde/slack-desc/libktorrent
new file mode 100644
index 0000000..5bc41f8
--- /dev/null
+++ b/source.local/kde/slack-desc/libktorrent
@@ -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------------------------------------------------------|
+libktorrent: libktorrent (Protocol library for the KDE BitTorrent program)
+libktorrent:
+libktorrent: Libktorrent is the BitTorrent protocol library for ktorrent, which
+libktorrent: contains all the torrent downloading code.  Although it is closely
+libktorrent: to ktorrent, the goal is to make libktorrent an independent
+libktorrent: library which can be used by other applications.
+libktorrent:
+libktorrent: Homepage:  http://ktorrent.org
+libktorrent:
+libktorrent:
+libktorrent:
diff --git a/source.local/kde/slack-desc/lskat b/source.local/kde/slack-desc/lskat
new file mode 100644
index 0000000..43c9ce7
--- /dev/null
+++ b/source.local/kde/slack-desc/lskat
@@ -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------------------------------------------------------|
+lskat: lskat (Lieutnant Skat card game for KDE)
+lskat:
+lskat: Lieutnant Skat (from German "Offiziersskat") is a fun and engaging
+lskat: card game for two players, where the second player is either live
+lskat: opponent, or a built in artificial intelligence.
+lskat:
+lskat:
+lskat:
+lskat:
+lskat: For more information, visit:  http://www.kde.org
+lskat:
diff --git a/source.local/kde/slack-desc/marble b/source.local/kde/slack-desc/marble
new file mode 100644
index 0000000..06e3e8e
--- /dev/null
+++ b/source.local/kde/slack-desc/marble
@@ -0,0 +1,20 @@
+# 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------------------------------------------------------|
+marble: marble (virtual globe)
+marble:
+marble: Marble is a virtual globe with advanced routing capabilities.  You can
+marble: download maps from a variety of themes and explore the surroundings.
+marble: Record your trip and share it with your friends.
+marble: Features:  online and offline routing, GPS tracking and recording,
+marble: themable maps (OpenStreetMap, Satellite Map and more), support for
+marble: different projections (globe, flat map, ...) and other planets,
+marble: download of maps and route data for offline usage.
+marble:
+marble: For more information, visit:  http://edu.kde.org/
+
diff --git a/source.local/kde/slack-desc/mplayerthumbs b/source.local/kde/slack-desc/mplayerthumbs
new file mode 100644
index 0000000..999518d
--- /dev/null
+++ b/source.local/kde/slack-desc/mplayerthumbs
@@ -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------------------------------------------------------|
+mplayerthumbs: mplayerthumbs (video thumbnail generator)
+mplayerthumbs:
+mplayerthumbs: MPlayerThumbs is a video thumbnail generator for KDE file managers
+mplayerthumbs: like Dolphin and Konqueror.  It enables them to show preview images
+mplayerthumbs: of video files. 
+mplayerthumbs:
+mplayerthumbs:
+mplayerthumbs:
+mplayerthumbs:
+mplayerthumbs: For more information, visit:  http://www.kde.org
+mplayerthumbs:
diff --git a/source.local/kde/slack-desc/nepomuk-core b/source.local/kde/slack-desc/nepomuk-core
new file mode 100644
index 0000000..c969b9e
--- /dev/null
+++ b/source.local/kde/slack-desc/nepomuk-core
@@ -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------------------------------------------------------|
+nepomuk-core: nepomuk-core (Nepomuk Core utilities and libraries)
+nepomuk-core:
+nepomuk-core: This package contains the Nepomuk Core utilities and libraries.
+nepomuk-core:
+nepomuk-core:
+nepomuk-core:
+nepomuk-core:
+nepomuk-core:
+nepomuk-core:
+nepomuk-core: For more information, visit:  http://www.kde.org
+nepomuk-core:
diff --git a/source.local/kde/slack-desc/nepomuk-widgets b/source.local/kde/slack-desc/nepomuk-widgets
new file mode 100644
index 0000000..f31413c
--- /dev/null
+++ b/source.local/kde/slack-desc/nepomuk-widgets
@@ -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------------------------------------------------------|
+nepomuk-widgets: nepomuk-widgets (nepomuk widgets)
+nepomuk-widgets:
+nepomuk-widgets: This package contains all of the Nepomuk widgets.
+nepomuk-widgets:
+nepomuk-widgets:
+nepomuk-widgets:
+nepomuk-widgets:
+nepomuk-widgets:
+nepomuk-widgets:
+nepomuk-widgets: For more information, visit:  http://nepomuk.kde.org/
+nepomuk-widgets:
diff --git a/source.local/kde/slack-desc/networkmanagement b/source.local/kde/slack-desc/networkmanagement
new file mode 100644
index 0000000..1c2ddcb
--- /dev/null
+++ b/source.local/kde/slack-desc/networkmanagement
@@ -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------------------------------------------------------|
+networkmanagement: networkmanagement (KDE network control panel and widget)
+networkmanagement:
+networkmanagement: KDE network control panel and widget.
+networkmanagement:
+networkmanagement: For more information, visit:
+networkmanagement:   http://userbase.kde.org/NetworkManagement
+networkmanagement:
+networkmanagement:
+networkmanagement:
+networkmanagement:
+networkmanagement:
diff --git a/source.local/kde/slack-desc/okular b/source.local/kde/slack-desc/okular
new file mode 100644
index 0000000..333d94f
--- /dev/null
+++ b/source.local/kde/slack-desc/okular
@@ -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------------------------------------------------------|
+okular: okular (a document viewer)
+okular:
+okular: Okular is a document viewer for KDE.
+okular:
+okular: For more information, visit:  http://www.kde.org
+okular:
+okular:
+okular:
+okular:
+okular:
+okular:
diff --git a/source.local/kde/slack-desc/oxygen-gtk2 b/source.local/kde/slack-desc/oxygen-gtk2
new file mode 100644
index 0000000..9398d8d
--- /dev/null
+++ b/source.local/kde/slack-desc/oxygen-gtk2
@@ -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------------------------------------------------------|
+oxygen-gtk2: oxygen-gtk2 (Oxygen GTK+ engine)
+oxygen-gtk2:
+oxygen-gtk2: Oxygen-Gtk2 is a port of the KDE widget theme Oxygen, to GTK+.
+oxygen-gtk2: It's primary goal is to ensure visual consistency between GTK+ and
+oxygen-gtk2: qt-based applications running under kde. A secondary objective is
+oxygen-gtk2: to also have a stand-alone nice looking GTK+ theme that would behave
+oxygen-gtk2: well on other Desktop Environments.
+oxygen-gtk2: Unlike other attempts made to port the kde oxygen theme to GTK+, this
+oxygen-gtk2: attempt does not depend on Qt.
+oxygen-gtk2:
+oxygen-gtk2: See: http://projects.kde.org/projects/playground/artwork/oxygen-gtk
diff --git a/source.local/kde/slack-desc/oxygen-gtk3 b/source.local/kde/slack-desc/oxygen-gtk3
new file mode 100644
index 0000000..43b7636
--- /dev/null
+++ b/source.local/kde/slack-desc/oxygen-gtk3
@@ -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------------------------------------------------------|
+oxygen-gtk3: oxygen-gtk3 (Oxygen GTK+3 engine)
+oxygen-gtk3:
+oxygen-gtk3: Oxygen-Gtk3 is a port of the KDE widget theme Oxygen, to GTK+3.
+oxygen-gtk3: It's primary goal is to ensure visual consistency between GTK+ and
+oxygen-gtk3: qt-based applications running under kde. A secondary objective is
+oxygen-gtk3: to also have a stand-alone nice looking GTK+ theme that would behave
+oxygen-gtk3: well on other Desktop Environments.
+oxygen-gtk3: Unlike other attempts made to port the kde oxygen theme to GTK+, this
+oxygen-gtk3: attempt does not depend on Qt.
+oxygen-gtk3:
+oxygen-gtk3: See: http://projects.kde.org/projects/playground/artwork/oxygen-gtk
diff --git a/source.local/kde/slack-desc/oxygen-icons b/source.local/kde/slack-desc/oxygen-icons
new file mode 100644
index 0000000..85a5e45
--- /dev/null
+++ b/source.local/kde/slack-desc/oxygen-icons
@@ -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------------------------------------------------------|
+oxygen-icons: oxygen-icons (Oxygen theme for the KDE Plasma Desktop)
+oxygen-icons:
+oxygen-icons: Oxygen provides a complete and modern icon theme for KDE.
+oxygen-icons:
+oxygen-icons: Visit the Oxygen project online:  http://www.oxygen-icons.org
+oxygen-icons:
+oxygen-icons:
+oxygen-icons:
+oxygen-icons:
+oxygen-icons:
+oxygen-icons:
diff --git a/source.local/kde/slack-desc/pairs b/source.local/kde/slack-desc/pairs
new file mode 100644
index 0000000..570aae2
--- /dev/null
+++ b/source.local/kde/slack-desc/pairs
@@ -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------------------------------------------------------|
+pairs: pairs (a memory game)
+pairs:
+pairs: Pairs is a game that will help train your memory by remembering
+pairs: different images, shapes, sounds and text.
+pairs:
+pairs:
+pairs:
+pairs:
+pairs:
+pairs: For more information, visit:  http://www.kde.org
+pairs:
diff --git a/source.local/kde/slack-desc/palapeli b/source.local/kde/slack-desc/palapeli
new file mode 100644
index 0000000..f0d2e85
--- /dev/null
+++ b/source.local/kde/slack-desc/palapeli
@@ -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------------------------------------------------------|
+palapeli: palapeli (jigsaw puzzle game)
+palapeli:
+palapeli: Palapeli is a single-player jigsaw puzzle game.
+palapeli: Unlike other games in that genre, you are not limited to aligning
+palapeli: pieces on imaginary grids.  The pieces are freely moveable.
+palapeli: Also, Palapeli features real persistency, i.e. everything you do
+palapeli: is saved on your disk immediately.
+palapeli:
+palapeli:
+palapeli: For more information, visit:  http://www.kde.org
+palapeli:
diff --git a/source.local/kde/slack-desc/parley b/source.local/kde/slack-desc/parley
new file mode 100644
index 0000000..c4c08e9
--- /dev/null
+++ b/source.local/kde/slack-desc/parley
@@ -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------------------------------------------------------|
+parley: parley (vocabulary trainer)
+parley:
+parley: Parley is a vocabulary trainer for KDE.
+parley:
+parley: For more information, visit:  http://edu.kde.org/
+parley:
+parley:
+parley:
+parley:
+parley:
+parley:
diff --git a/source.local/kde/slack-desc/perlkde b/source.local/kde/slack-desc/perlkde
new file mode 100644
index 0000000..2857717
--- /dev/null
+++ b/source.local/kde/slack-desc/perlkde
@@ -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------------------------------------------------------|
+perlkde: perlkde (perl bindings for KDE)
+perlkde:
+perlkde: Perl bindings for KDE.
+perlkde:
+perlkde: For more information, visit:  http://www.kde.org
+perlkde:
+perlkde:
+perlkde:
+perlkde:
+perlkde:
+perlkde:
diff --git a/source.local/kde/slack-desc/perlqt b/source.local/kde/slack-desc/perlqt
new file mode 100644
index 0000000..3023348
--- /dev/null
+++ b/source.local/kde/slack-desc/perlqt
@@ -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------------------------------------------------------|
+perlqt: perlqt (Perl OO interface to Qt)
+perlqt:
+perlqt: A Perl Object Oriented interface to the Qt GUI Toolkit.
+perlqt: Access to the KDE Desktop Environment libraries is planned as well.
+perlqt:
+perlqt: For more information, visit:  http://perlqt.sourceforge.net
+perlqt:
+perlqt:
+perlqt:
+perlqt:
+perlqt:
diff --git a/source.local/kde/slack-desc/picmi b/source.local/kde/slack-desc/picmi
new file mode 100644
index 0000000..bc23ac6
--- /dev/null
+++ b/source.local/kde/slack-desc/picmi
@@ -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------------------------------------------------------|
+picmi: picmi (logic puzzle game)
+picmi:
+picmi: Picmi is a single player logic-based puzzle game.
+picmi: The goal is to color cells according to numbers given at the side
+picmi: of the board in order to uncover a hidden pattern or picture. 
+picmi:
+picmi:
+picmi:
+picmi:
+picmi: For more information, visit:  http://www.kde.org
+picmi:
diff --git a/source.local/kde/slack-desc/polkit-kde-agent-1 b/source.local/kde/slack-desc/polkit-kde-agent-1
new file mode 100644
index 0000000..8b6f29b
--- /dev/null
+++ b/source.local/kde/slack-desc/polkit-kde-agent-1
@@ -0,0 +1,18 @@
+# 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-----------------------------------------------------|
+polkit-kde-agent-1: polkit-kde-agent-1 (KDE polkit authenticator)
+polkit-kde-agent-1:
+polkit-kde-agent-1: This is a polkit authenticator for KDE.
+polkit-kde-agent-1: 
+polkit-kde-agent-1: 
+polkit-kde-agent-1: 
+polkit-kde-agent-1: 
+polkit-kde-agent-1:
+polkit-kde-agent-1: 
+polkit-kde-agent-1:
diff --git a/source.local/kde/slack-desc/polkit-kde-kcmodules-1 b/source.local/kde/slack-desc/polkit-kde-kcmodules-1
new file mode 100644
index 0000000..a98ca5f
--- /dev/null
+++ b/source.local/kde/slack-desc/polkit-kde-kcmodules-1
@@ -0,0 +1,18 @@
+# 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-----------------------------------------------------|
+polkit-kde-kcmodules-1: polkit-kde-kcmodules-1 (KDE polkit kcmodules)
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1: This package contains the kcm_polkit modules for KDE.
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
+polkit-kde-kcmodules-1:
diff --git a/source.local/kde/slack-desc/polkit-qt-1 b/source.local/kde/slack-desc/polkit-qt-1
new file mode 100644
index 0000000..ed2cf40
--- /dev/null
+++ b/source.local/kde/slack-desc/polkit-qt-1
@@ -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-----------------------------------------------------|
+polkit-qt-1: polkit-qt-1 (Qt polkit API wrapper)
+polkit-qt-1:
+polkit-qt-1: polkit-qt-1 aims to make it easy for Qt developers to take advantage
+polkit-qt-1: of the polkit API.  It is a convenience wrapper around QAction and
+polkit-qt-1: QAbstractButton that lets you integrate those two components
+polkit-qt-1: easily with polkit.
+polkit-qt-1:
+polkit-qt-1: Homepage: http://techbase.kde.org/Polkit-Qt-1
+polkit-qt-1:
+polkit-qt-1:
+polkit-qt-1:
diff --git a/source.local/kde/slack-desc/print-manager b/source.local/kde/slack-desc/print-manager
new file mode 100644
index 0000000..623c0bc
--- /dev/null
+++ b/source.local/kde/slack-desc/print-manager
@@ -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------------------------------------------------------|
+print-manager: print-manager (tool for managing print jobs and printers)
+print-manager:
+print-manager: Print Manager (formerly printer-applet) is a system tray utility
+print-manager: that shows current print jobs, printer warnings, and errors.
+print-manager:
+print-manager:
+print-manager:
+print-manager:
+print-manager: Homepage:
+print-manager:   https://projects.kde.org/projects/kde/kdeutils/print-manager
+print-manager:
diff --git a/source.local/kde/slack-desc/printer-applet b/source.local/kde/slack-desc/printer-applet
new file mode 100644
index 0000000..f2dd263
--- /dev/null
+++ b/source.local/kde/slack-desc/printer-applet
@@ -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 mprinter-applets 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------------------------------------------------------|
+printer-applet: printer-applet (printer applet)
+printer-applet:
+printer-applet: Printer Applet is a system tray utility that shows current print
+printer-applet: jobs, printer warnings, and errors.
+printer-applet:
+printer-applet: Homepage:  http://utils.kde.org/projects/printer-applet
+printer-applet:
+printer-applet:
+printer-applet:
+printer-applet:
+printer-applet:
diff --git a/source.local/kde/slack-desc/prison b/source.local/kde/slack-desc/prison
new file mode 100644
index 0000000..aa99009
--- /dev/null
+++ b/source.local/kde/slack-desc/prison
@@ -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-----------------------------------------------------|
+prison: prison (Qt based Barcode API)
+prison:
+prison: Prison is a barcode API currently offering a Qt API to produce 
+prison: QRCode barcodes and DotMatrix barcodes. 
+prison:
+prison: git clone git://anongit.kde.org/prison
+prison:
+prison:
+prison:
+prison:
+prison:
diff --git a/source.local/kde/slack-desc/pykde4 b/source.local/kde/slack-desc/pykde4
new file mode 100644
index 0000000..65fe3a1
--- /dev/null
+++ b/source.local/kde/slack-desc/pykde4
@@ -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------------------------------------------------------|
+pykde4: pykde4 (Python bindings for KDE4)
+pykde4:
+pykde4: Python bindings for KDE4.
+pykde4:
+pykde4: For more information, visit:  http://www.kde.org
+pykde4:
+pykde4:
+pykde4:
+pykde4:
+pykde4:
+pykde4:
diff --git a/source.local/kde/slack-desc/qtruby b/source.local/kde/slack-desc/qtruby
new file mode 100644
index 0000000..9f02b06
--- /dev/null
+++ b/source.local/kde/slack-desc/qtruby
@@ -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------------------------------------------------------|
+qtruby: qtruby (Qt bindings for ruby)
+qtruby:
+qtruby: QtRuby is part of Korundum, very complete bindings to both the KDE
+qtruby: API and the Qt APIs. The Korundum package includes both a QtRuby
+qtruby: Qt-only binding along with the full combined Qt/KDE one.
+qtruby: The QtRuby package contains just Qt bindings, with no dependency
+qtruby: on KDE.
+qtruby:
+qtruby: For more information, see:  http://rubyforge.org/projects/korundum/
+qtruby:
+qtruby:
diff --git a/source.local/kde/slack-desc/quanta b/source.local/kde/slack-desc/quanta
new file mode 100644
index 0000000..af1cadf
--- /dev/null
+++ b/source.local/kde/slack-desc/quanta
@@ -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------------------------------------------------------|
+quanta: quanta (Quanta Plus web development environment)
+quanta:
+quanta: Quanta Plus is a web development environment for HTML and associate
+quanta: languages.  It is designed for quick web development.
+quanta: Quanta Plus includes the ability to run a debugger.
+quanta:
+quanta: Project page:
+quanta:   https://projects.kde.org/projects/playground/devtools/quanta
+quanta:
+quanta:
+quanta:
diff --git a/source.local/kde/slack-desc/qyoto b/source.local/kde/slack-desc/qyoto
new file mode 100644
index 0000000..9ca953e
--- /dev/null
+++ b/source.local/kde/slack-desc/qyoto
@@ -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------------------------------------------------------|
+qyoto: qyoto (C# Mono Qt4 bindings)
+qyoto:
+qyoto: C# Mono Qt 4 language bindings.
+qyoto:
+qyoto: For more information, visit:  http://www.www.org
+qyoto:
+qyoto:
+qyoto:
+qyoto:
+qyoto:
+qyoto:
diff --git a/source.local/kde/slack-desc/rocs b/source.local/kde/slack-desc/rocs
new file mode 100644
index 0000000..8ba31c9
--- /dev/null
+++ b/source.local/kde/slack-desc/rocs
@@ -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------------------------------------------------------|
+rocs: rocs (graph theory IDE)
+rocs:
+rocs: Rocs is a Graph Theory IDE for professors and students.
+rocs:
+rocs: For more information, visit:  http://edu.kde.org/
+rocs:
+rocs:
+rocs:
+rocs:
+rocs:
+rocs:
diff --git a/source.local/kde/slack-desc/skanlite b/source.local/kde/slack-desc/skanlite
new file mode 100644
index 0000000..b4e994d
--- /dev/null
+++ b/source.local/kde/slack-desc/skanlite
@@ -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------------------------------------------------------|
+skanlite: skanlite (a scanning program)
+skanlite:
+skanlite: Skanlite is a light-weight scanning application based on libksane.
+skanlite:
+skanlite:
+skanlite:
+skanlite:
+skanlite:
+skanlite:
+skanlite:
+skanlite:
diff --git a/source.local/kde/slack-desc/smokegen b/source.local/kde/slack-desc/smokegen
new file mode 100644
index 0000000..17142b4
--- /dev/null
+++ b/source.local/kde/slack-desc/smokegen
@@ -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------------------------------------------------------|
+smokegen: smokegen (smoke generator)
+smokegen:
+smokegen: Smoke Generator.  The main purpose of SMOKE is making it easier to
+smokegen: write bindings from scripting languages to Qt and KDE - with an
+smokegen: emphasis on ease of use and flexibility.
+smokegen:
+smokegen: For more information, visit:  http://www.kde.org
+smokegen:
+smokegen:
+smokegen:
+smokegen:
diff --git a/source.local/kde/slack-desc/smokekde b/source.local/kde/slack-desc/smokekde
new file mode 100644
index 0000000..8fee37a
--- /dev/null
+++ b/source.local/kde/slack-desc/smokekde
@@ -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------------------------------------------------------|
+smokekde: smokekde (smoke-kde library)
+smokekde:
+smokekde: Smoke generator.
+smokekde:
+smokekde: For more information, visit:  http://www.kde.org
+smokekde:
+smokekde:
+smokekde:
+smokekde:
+smokekde:
+smokekde:
diff --git a/source.local/kde/slack-desc/smokeqt b/source.local/kde/slack-desc/smokeqt
new file mode 100644
index 0000000..dfac28c
--- /dev/null
+++ b/source.local/kde/slack-desc/smokeqt
@@ -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------------------------------------------------------|
+smokeqt: smokeqt (bindings for Qt libraries)
+smokeqt:
+smokeqt: This package includes bindings for Qt libraries.
+smokeqt:
+smokeqt: For more information, visit:  http://www.kde.org
+smokeqt:
+smokeqt:
+smokeqt:
+smokeqt:
+smokeqt:
+smokeqt:
diff --git a/source.local/kde/slack-desc/step b/source.local/kde/slack-desc/step
new file mode 100644
index 0000000..6b3c8bf
--- /dev/null
+++ b/source.local/kde/slack-desc/step
@@ -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------------------------------------------------------|
+step: step (interactive physics simulator)
+step:
+step: Step is an interactive physical simulator.
+step: It works like this: you place some bodies on the scene, add some
+step: forces such as gravity or springs, then click "Simulate" and Step
+step: shows you how your scene will evolve according to the laws of physics.
+step: With Step you can not only learn but feel how physics works !
+step:
+step: For more information, visit:  http://edu.kde.org/
+step:
+step:
diff --git a/source.local/kde/slack-desc/strigi b/source.local/kde/slack-desc/strigi
new file mode 100644
index 0000000..16dda7e
--- /dev/null
+++ b/source.local/kde/slack-desc/strigi
@@ -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-----------------------------------------------------|
+strigi: strigi (fast and light desktop search engine)
+strigi:
+strigi: Strigi is a fast and light desktop search engine.  It can handle a 
+strigi: large range of file formats such as emails, office documents, media
+strigi: files, and file archives.  It can index files that are embedded in 
+strigi: other files.  This means email attachments and files in zip files
+strigi: are searchable as if they were normal files on your harddisk. 
+strigi:
+strigi: Homepage:  http://strigi.sourceforge.net/
+strigi:
+strigi:
diff --git a/source.local/kde/slack-desc/strigi-multimedia b/source.local/kde/slack-desc/strigi-multimedia
new file mode 100644
index 0000000..0f6660b
--- /dev/null
+++ b/source.local/kde/slack-desc/strigi-multimedia
@@ -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------------------------------------------------------|
+strigi-multimedia: strigi-multimedia (Strigi multimedia analyzers)
+strigi-multimedia:
+strigi-multimedia: Various analyzers to provide multimedia support to Strigi.
+strigi-multimedia:
+strigi-multimedia:
+strigi-multimedia:
+strigi-multimedia:
+strigi-multimedia:
+strigi-multimedia:
+strigi-multimedia: For more information, visit:  http://www.kde.org
+strigi-multimedia:
diff --git a/source.local/kde/slack-desc/superkaramba b/source.local/kde/slack-desc/superkaramba
new file mode 100644
index 0000000..535e35e
--- /dev/null
+++ b/source.local/kde/slack-desc/superkaramba
@@ -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 msuperkarambas 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------------------------------------------------------|
+superkaramba: superkaramba (interactive widget manager)
+superkaramba:
+superkaramba: SuperKaramba is a tool that allows you to easily create
+superkaramba: interactive widgets on your KDE desktop.
+superkaramba:
+superkaramba: Home page:  https://projects.kde.org/projects/kde/kdeutils/
+superkaramba:
+superkaramba:
+superkaramba:
+superkaramba:
+superkaramba:
diff --git a/source.local/kde/slack-desc/svgpart b/source.local/kde/slack-desc/svgpart
new file mode 100644
index 0000000..dbee48b
--- /dev/null
+++ b/source.local/kde/slack-desc/svgpart
@@ -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------------------------------------------------------|
+svgpart: svgpart (SVG plugin for KDE)
+svgpart:
+svgpart: KPart for viewing SVG files in KDE.
+svgpart:
+svgpart: For more information, visit:  http://www.kde.org
+svgpart:
+svgpart:
+svgpart:
+svgpart:
+svgpart:
+svgpart:
diff --git a/source.local/kde/slack-desc/sweeper b/source.local/kde/slack-desc/sweeper
new file mode 100644
index 0000000..b0ae9f3
--- /dev/null
+++ b/source.local/kde/slack-desc/sweeper
@@ -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 msweepers 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------------------------------------------------------|
+sweeper: sweeper (remove traces of your activities)
+sweeper:
+sweeper: Sweeper helps to clean unwanted traces the user leaves on the system.
+sweeper:
+sweeper: Home page:  https://projects.kde.org/projects/kde/kdeutils/sweeper
+sweeper:
+sweeper:
+sweeper:
+sweeper:
+sweeper:
+sweeper:
diff --git a/source.local/kde/slack-desc/wicd-kde b/source.local/kde/slack-desc/wicd-kde
new file mode 100644
index 0000000..8c0e87d
--- /dev/null
+++ b/source.local/kde/slack-desc/wicd-kde
@@ -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------------------------------------------------------|
+wicd-kde: wicd-kde (Wicd client built on the KDE Development Platform)
+wicd-kde:
+wicd-kde: A Wicd client built on the KDE Development Platform.
+wicd-kde:
+wicd-kde: For more information, visit:
+wicd-kde:   https://projects.kde.org/projects/extragear/network/wicd-kde
+wicd-kde:
+wicd-kde:
+wicd-kde:
+wicd-kde:
+wicd-kde:
diff --git a/source.local/l/ConsoleKit/ConsoleKit.SlackBuild b/source.local/l/ConsoleKit/ConsoleKit.SlackBuild
index 7c3821c..3ba5f00 100755
--- a/source.local/l/ConsoleKit/ConsoleKit.SlackBuild
+++ b/source.local/l/ConsoleKit/ConsoleKit.SlackBuild
@@ -24,42 +24,43 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-PRGNAM=ConsoleKit
-VERSION=${VERSION:-0.4.3}
+PKGNAM=ConsoleKit
+VERSION=${VERSION:-0.4.5}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -69,14 +70,14 @@ esac
 
 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 . \
@@ -88,6 +89,11 @@ find . \
 # Clean up at_console compat files, bug #257761
 zcat $CWD/consolekit-0.2.10-cleanup_console_tags.patch.gz | patch -p1 || exit 1
 
+# ck-history: don't truncate --frequent output to 8 chars
+# GDM screenscrapes the output and so we need the full username.
+# https://bugzilla.gnome.org/show_bug.cgi?id=650330
+zcat $CWD/ck-history-don-t-truncate-frequent-output-to-8-chars.patch.gz | patch -p1 || exit 1
+
 # Revert "Only set sessions to be is-local=true if set by a trusted party"
 #   http://cgit.freedesktop.org/ConsoleKit/commit/?id=4f88228f31a63c026c424a92827f26ad7535275c
 # Here are the bug reports:
@@ -107,7 +113,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
   --with-pid-file=/var/run/ConsoleKit/pid \
   --enable-docbook-docs \
   --enable-pam-module=no \
@@ -134,18 +140,38 @@ chmod 0755 $PKG/etc/rc.d/rc.consolekit.new
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  AUTHORS COPYING HACKING 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
 
 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.local/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch.gz b/source.local/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch.gz
new file mode 100644
index 0000000..2481f16
--- /dev/null
+++ b/source.local/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch.gz
diff --git a/source.local/l/GConf/GConf.SlackBuild b/source.local/l/GConf/GConf.SlackBuild
new file mode 100755
index 0000000..7d51dd2
--- /dev/null
+++ b/source.local/l/GConf/GConf.SlackBuild
@@ -0,0 +1,149 @@
+#!/bin/sh
+
+# Slackware build script for GConf
+
+# Copyright 2010, 2011  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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=GConf
+VERSION=${VERSION:-3.2.6}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# This should be fixed in 3.2.6, I hope - it's a bug exposed by glib-2.32
+sed -i '/INTROSPECTION_SCANNER_ARGS/s#$# -lgmodule-2.0#' gconf/Makefile.in
+
+# --disable-orbit means we use DBUS for IPC
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --with-gtk=2.0 \
+  --disable-static \
+  --enable-debug=no \
+  --disable-orbit \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mv $PKG/etc/gconf/2/path $PKG/etc/gconf/2/path.new
+mv $PKG/etc/gconf/2/evoldap.conf $PKG/etc/gconf/2/evoldap.conf.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS COPYING* 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/${PKGNAM}-$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 | sed "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX}," > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/GConf/doinst.sh.gz b/source.local/l/GConf/doinst.sh.gz
new file mode 100644
index 0000000..77561c6
--- /dev/null
+++ b/source.local/l/GConf/doinst.sh.gz
diff --git a/source.local/l/GConf/slack-desc b/source.local/l/GConf/slack-desc
new file mode 100644
index 0000000..7994adc
--- /dev/null
+++ b/source.local/l/GConf/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 ':'.
+
+     |-----handy-ruler-------------------------------------------------------|
+GConf: GConf (GNOME configuration library)
+GConf: 
+GConf: GConf is a configuration database system designed for the GNOME project
+GConf: and applications based on GTK+.  It is conceptually similar to the
+GConf: Windows registry.
+GConf:
+GConf: For information, see:  http://projects.gnome.org/gconf/
+GConf: 
+GConf: 
+GConf: 
+GConf: 
diff --git a/source.local/l/M2Crypto/M2Crypto.SlackBuild b/source.local/l/M2Crypto/M2Crypto.SlackBuild
index 48086c8..847bc64 100755
--- a/source.local/l/M2Crypto/M2Crypto.SlackBuild
+++ b/source.local/l/M2Crypto/M2Crypto.SlackBuild
@@ -21,35 +21,41 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=M2Crypto
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.21.1}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
diff --git a/source.local/l/PyQt/PyQt.SlackBuild b/source.local/l/PyQt/PyQt.SlackBuild
new file mode 100755
index 0000000..6d99b91
--- /dev/null
+++ b/source.local/l/PyQt/PyQt.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for PyQt
+
+# Copyright 2008  Aleksandar Samardzic <asamardzic@gmail.com>
+# Copyright 2008, 2009, 2010, 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.
+
+# Modified by Robby Workman <rworkman@slackware.com>
+# Modified by Eric Hameleers <alien@slackware.com>
+
+PKGNAM=PyQt
+VERSION=${VERSION:-4.9.6}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-x11-gpl-$VERSION
+tar xvf $CWD/$PKGNAM-x11-gpl-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-x11-gpl-$VERSION || exit 1
+
+# Fix phonon detection:
+zcat $CWD/$PKGNAM.phonon.diff.gz | patch -p1 --verbose || 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 {} \;
+
+# This avoids compiling a version number into KDE's .la files:
+export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
+
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+
+python configure.py --confirm-license --verbose
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS doc/* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/PyQt/PyQt.phonon.diff.gz b/source.local/l/PyQt/PyQt.phonon.diff.gz
new file mode 100644
index 0000000..b1441a4
--- /dev/null
+++ b/source.local/l/PyQt/PyQt.phonon.diff.gz
diff --git a/source.local/l/PyQt/slack-desc b/source.local/l/PyQt/slack-desc
new file mode 100644
index 0000000..f713c87
--- /dev/null
+++ b/source.local/l/PyQt/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 ':'.
+
+    |-----handy-ruler------------------------------------------------------|
+PyQt: PyQt (Python bindings for Qt)
+PyQt:
+PyQt: PyQt is a set of Python bindings for Trolltech's Qt application
+PyQt: framework and runs on all platforms supported by Qt.
+PyQt: 
+PyQt: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
+PyQt: 
+PyQt:
+PyQt:
+PyQt:
+PyQt:
diff --git a/source.local/l/QScintilla/QScintilla.SlackBuild b/source.local/l/QScintilla/QScintilla.SlackBuild
new file mode 100755
index 0000000..53a3f4e
--- /dev/null
+++ b/source.local/l/QScintilla/QScintilla.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# Slackware build script for QScintilla
+
+# Copyright 2008  Robby Workman <rworkman@slackware.com> Northport, AL, 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
+# 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=QScintilla
+VERSION=${VERSION:-2.6.1}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-gpl-$VERSION
+tar xvf $CWD/$PKGNAM-gpl-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-gpl-$VERSION || 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 Qt4
+  qmake -o Makefile qscintilla.pro
+  make $NUMJOBS
+  make install INSTALL_ROOT=$PKG
+  # Yes, we'll spam the dev environment so we can build the other parts.
+  make install
+cd -
+
+cd designer-Qt4
+  qmake -o Makefile designer.pro
+  make $NUMJOBS
+  make install INSTALL_ROOT=$PKG
+cd -
+
+cd Python
+  python configure.py -p 4 
+  make $NUMJOBS
+  make install DESTDIR=$PKG
+cd -
+
+# Link the shared libraries into /usr/lib${LIBDIRSUFFIX}:
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  for file in qt/lib/*.so* ; do
+    ln -sf $file .
+  done
+)
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  *GPL* COPYING* NEWS OPENSOURCE-NOTICE.TXT README* doc/html-Qt4 doc/Scintilla \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/QScintilla/slack-desc b/source.local/l/QScintilla/slack-desc
new file mode 100644
index 0000000..f6edc09
--- /dev/null
+++ b/source.local/l/QScintilla/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 ':'.
+
+          |-----handy-ruler--------------------------------------------------|
+QScintilla: QScintilla (Qt port of the Scintilla C++ editor control)
+QScintilla:
+QScintilla: QScintilla includes features especially useful when editing and 
+QScintilla: debugging source code.  These include support for syntax styling, 
+QScintilla: error indicators, code completion, and call tips.  The selection 
+QScintilla: margin can contain markers like those used in debuggers to 
+QScintilla: indicate breakpoints and the current line.  Styling choices are 
+QScintilla: more open than with many editors, allowing the use of 
+QScintilla: proportional fonts, bold and italics, multiple foreground and 
+QScintilla: background colours, and multiple fonts.
+QScintilla:
diff --git a/source.local/l/akonadi/akonadi.SlackBuild b/source.local/l/akonadi/akonadi.SlackBuild
new file mode 100755
index 0000000..68ba514
--- /dev/null
+++ b/source.local/l/akonadi/akonadi.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/sh 
+
+# Slackware build script for akonadi
+
+# Copyright 2008  Robby Workman, Northport, Alabama, USA
+# Copyright 2008, 2009, 2010, 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=akonadi
+VERSION=${VERSION:-1.9.1}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# If we do not specify the correct QT_PLUGINS_DIR, then the application
+# decides on using $QT4DIR/qt4/plugins instead.
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \
+    -DQT_PLUGINS_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+if [ -d $PKG/usr/man ]; then
+  gzip -9 $PKG/usr/man/man?/*
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS INSTALL README lgpl-license \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+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
+
diff --git a/source.local/l/akonadi/doinst.sh.gz b/source.local/l/akonadi/doinst.sh.gz
new file mode 100644
index 0000000..bedb7a0
--- /dev/null
+++ b/source.local/l/akonadi/doinst.sh.gz
diff --git a/source.local/l/akonadi/slack-desc b/source.local/l/akonadi/slack-desc
new file mode 100644
index 0000000..d0c26bb
--- /dev/null
+++ b/source.local/l/akonadi/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 ':'.
+
+       |-----handy-ruler-----------------------------------------------------|
+akonadi: akonadi (PIM storage service)
+akonadi:
+akonadi: akonadi is an extensible cross-desktop storage service for PIM data 
+akonadi: and meta data providing concurrent read, write, and query access. 
+akonadi: It will provide a unique desktop wide object identification and 
+akonadi: retrieval.
+akonadi:
+akonadi: Homepage:  http://www.kdepim.org/akonadi/
+akonadi:
+akonadi:
+akonadi:
diff --git a/source.local/l/apr-util/apr-util-1.4.1.tar.bz2.asc b/source.local/l/apr-util/apr-util-1.4.1.tar.bz2.asc
deleted file mode 100644
index cac38e4..0000000
--- a/source.local/l/apr-util/apr-util-1.4.1.tar.bz2.asc
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iEYEABECAAYFAk7f7loACgkQNEqETXUdfyfQtwCePykrvmWzOLE4E0mIIHbWDhzW
-cdUAn2rBabd2Ab1HSDArwjow6B8hMGal
-=n6ut
------END PGP SIGNATURE-----
diff --git a/source.local/l/apr-util/apr-util-1.5.1.tar.bz2.asc b/source.local/l/apr-util/apr-util-1.5.1.tar.bz2.asc
new file mode 100644
index 0000000..63474a1
--- /dev/null
+++ b/source.local/l/apr-util/apr-util-1.5.1.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIVAwUAUEppfMaHXzVBzv3gAQgEoRAAjXqq3U0trIfEc7zxFsq0zhc1AhPNZ4UK
+IXUBMsyp0/cpx9K0OxqjvrgxRqu9K75wregxQAIctTkdNAh64IzS5lOwQIxxFoak
+PloZ12PCH8JWlCdy/tCnzA8f3CMMzeZcOUgX8tJ+CtB7/1ZNPHrsCk/1aU1B04sA
+aLyP4Wggb8OjgnmUnkmfTHugKD7nMEH6lZbAQ9Mann2ilnsQOI7dMMSwThQOYaJv
+epWEUT/J2t4B0qfFh5MYmw0CwgYGI8g3DhdfoR2hEs0bfbvESMl92rjRhjLRg9zx
+kkD/P9WjvKDQMZE/u0HZarjaoB5FKfz17Iqc4iXWUQ50cCuswdfxcJhLLmDWReAD
+D2IgqygDG94e9kTN6WlicsTC6jugfyrGoF14wjTA3udua5WyOUdOT7vmgvKrhz7U
+G1N0qVBTIpOPtE9Z5LhSHiw83ej/PHyqtEFexVbQ38Hh4ICS7thJdWgs+QOmdtEV
+lttNo3lBLk+krFef0FDp3jqfWqGKHY4lb1TzidGQ37emn2EW6f2NKYzs1s8uevW2
+bEBmpzsXn1hnEKocgxyom5jOX6KBYdEMISA16AYWODlyu7nrM5La6oVwD7XFD6XN
+h4JaBHOW5QqEZzbCxmRLxVVxkE5R6EHwuP197kZ6PwZLYUChswhPVP3iv9Wbwd2Q
+tmwxMD+nVA8=
+=o59h
+-----END PGP SIGNATURE-----
diff --git a/source.local/l/apr-util/apr-util.SlackBuild b/source.local/l/apr-util/apr-util.SlackBuild
index bb0115a..7933399 100755
--- a/source.local/l/apr-util/apr-util.SlackBuild
+++ b/source.local/l/apr-util/apr-util.SlackBuild
@@ -24,38 +24,39 @@
 
 
 PKGNAM=apr-util
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.5.1}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/apr-util/apr-util.url b/source.local/l/apr-util/apr-util.url
index 264a63c..ad13f22 100644
--- a/source.local/l/apr-util/apr-util.url
+++ b/source.local/l/apr-util/apr-util.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/apr/apr-util-1.3.11.tar.bz2
-http://www.apache.org/dist/apr/apr-util-1.3.11.tar.bz2.asc
+http://www.apache.org/dist/apr/apr-util-1.5.1.tar.bz2
+http://www.apache.org/dist/apr/apr-util-1.5.1.tar.bz2.asc
diff --git a/source.local/l/apr/apr-1.4.5.tar.bz2.asc b/source.local/l/apr/apr-1.4.5.tar.bz2.asc
deleted file mode 100644
index c5f6329..0000000
--- a/source.local/l/apr/apr-1.4.5.tar.bz2.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQIcBAABCgAGBQJN1bE9AAoJEOxYLrY5/wkszlgP/0gRoTctrY92WKmNtSJ1FJ4a
-GbCJGjjT0/SeH0VhGF2nVaAmyiM5hPPiMm5jmrce5JynB839O0H2BkRQzLdWjr92
-teUb4j2ljAGfneu/C5YEkb4i8zQ5US1Aes2V8al47dMDCtvmv6LbhmYBz+HRXPZ/
-WmnBz9l5u6k8ZR2EbBXNKXx6b07yWL36IpubOXeCtHlxwYbLGmFhjqk712XbpPzr
-Ps5LFgGAWidr6zrBImZ0Qr77TMn/l2GFcIK4G7GvEHVodAHIdsbdVzpbA0Xa/JQ+
-1RS1Bza7lAcGEvXchKxm5D0P3bzBdn+285zmwh4s6sX/RpGlrmCHGGGZDKKgHynL
-KiGs4D/sK/CcsGfUpdFjc4/Ve6JuE79EZx2h4KyugWu8cbgITLU8DvNne0BKEjKV
-yALyKVA4rt6bHVpN90LbPBqBvQK1G8VBebvlb2J20y2+pHTv8Q2PJW+ZuF8scp+L
-gWmqTs8VbaWDQ/LLrjEgYyTVOyGHlX+0WCiFkmGUoNNtdxX7S92QloTNSQFudASR
-AwptTz3UTCHfP+XWGJb+9VCnBuNVSpabQcU++cbIwoy9/Nv/6Ua3kuwU04MQGBeO
-1xm0234Pjtrmy6G2hyT66jMwBv4jjSB/3Njhy+39bREzulLKhO8L4mRMAITHz4bk
-pvk9yEmjPvvygZLFtize
-=rIKs
------END PGP SIGNATURE-----
diff --git a/source.local/l/apr/apr-1.4.6.tar.bz2.asc b/source.local/l/apr/apr-1.4.6.tar.bz2.asc
new file mode 100644
index 0000000..03b079b
--- /dev/null
+++ b/source.local/l/apr/apr-1.4.6.tar.bz2.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQEVAwUATzGxNnGtyF6eSShKAQIGFwgAlk9BcC/9rLmeMKzhHKJFBzFDcjqy6Sbi
+yZnO8DK2hPVRvcVkz/IxbpmFOa5rXPXrl/50XEkoLtZTF1tfCqQw49U5OvZ668el
+PTNNT6RNyN3SHvSXWCumnndMT1z5S8QDE5KHwzXmI9Hc0c3to78QUi5E/WBI1f8s
+lUMmgZ0hgY3XMcGs2hkPlvojTTP0Cl97rkznkHdKWApoEKIhij544BxTuCqyPvIC
+MH9KScb4MOxVeV5JKTbIoKVaJLPbOZeiHlu3brDeRkA1HrMrL9UE7k1cTpCBof7i
+G9Dd4RyGMrK29apyato/SoHek0jqqlhvQvtC8k40/QBVIFzmUNzirw==
+=J9ns
+-----END PGP SIGNATURE-----
diff --git a/source.local/l/apr/apr.SlackBuild b/source.local/l/apr/apr.SlackBuild
index ab353b6..e12fee5 100755
--- a/source.local/l/apr/apr.SlackBuild
+++ b/source.local/l/apr/apr.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=apr
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.4.6}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/apr/apr.url b/source.local/l/apr/apr.url
index 4b26462..1ff6c67 100644
--- a/source.local/l/apr/apr.url
+++ b/source.local/l/apr/apr.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/apr/apr-1.4.4.tar.bz2
-http://www.apache.org/dist/apr/apr-1.4.4.tar.bz2.asc
+http://www.apache.org/dist/apr/apr-1.4.6.tar.bz2
+http://www.apache.org/dist/apr/apr-1.4.6.tar.bz2.asc
diff --git a/source.local/l/at-spi2-atk/at-spi2-atk.SlackBuild b/source.local/l/at-spi2-atk/at-spi2-atk.SlackBuild
new file mode 100755
index 0000000..9fa1ca5
--- /dev/null
+++ b/source.local/l/at-spi2-atk/at-spi2-atk.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Copyright 2013  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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=at-spi2-atk
+VERSION=${VERSION:-2.6.2}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$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/$PKGNAM-$VERSION \
+  --build=$TARGET
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+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
+
diff --git a/source.local/l/at-spi2-atk/doinst.sh.gz b/source.local/l/at-spi2-atk/doinst.sh.gz
new file mode 100644
index 0000000..dfde7d0
--- /dev/null
+++ b/source.local/l/at-spi2-atk/doinst.sh.gz
diff --git a/source.local/l/at-spi2-atk/slack-desc b/source.local/l/at-spi2-atk/slack-desc
new file mode 100644
index 0000000..e3d1a82
--- /dev/null
+++ b/source.local/l/at-spi2-atk/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------------------------------------------------------|
+at-spi2-atk: at-spi2-atk (AT-SPI2 bridge to ATK)
+at-spi2-atk:
+at-spi2-atk: The At-Spi2 Atk package contains a library that bridges ATK to the
+at-spi2-atk: At-Spi2 D-Bus service.
+at-spi2-atk:
+at-spi2-atk:
+at-spi2-atk:
+at-spi2-atk:
+at-spi2-atk:
+at-spi2-atk:
+at-spi2-atk:
diff --git a/source.local/l/at-spi2-core/at-spi2-core.SlackBuild b/source.local/l/at-spi2-core/at-spi2-core.SlackBuild
new file mode 100755
index 0000000..db14d4e
--- /dev/null
+++ b/source.local/l/at-spi2-core/at-spi2-core.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Copyright 2013  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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=at-spi2-core
+VERSION=${VERSION:-2.6.3}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$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/$PKGNAM-$VERSION \
+  --build=$TARGET
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mv $PKG/etc/at-spi2/accessibility.conf $PKG/etc/at-spi2/accessibility.conf.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/at-spi2-core/doinst.sh.gz b/source.local/l/at-spi2-core/doinst.sh.gz
new file mode 100644
index 0000000..b6b4150
--- /dev/null
+++ b/source.local/l/at-spi2-core/doinst.sh.gz
diff --git a/source.local/l/at-spi2-core/slack-desc b/source.local/l/at-spi2-core/slack-desc
new file mode 100644
index 0000000..fa2cc48
--- /dev/null
+++ b/source.local/l/at-spi2-core/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------------------------------------------------------|
+at-spi2-core: at-spi2-core (Assistive Technology Service Provider Interface core) 
+at-spi2-core:
+at-spi2-core: The At-Spi2 Core package is a part of the GNOME Accessibility
+at-spi2-core: Project.  It provides a service provider interface for the 
+at-spi2-core: assistive technologies available on the GNOME platform and a
+at-spi2-core: library against which applications can be linked. 
+at-spi2-core:
+at-spi2-core:
+at-spi2-core:
+at-spi2-core:
+at-spi2-core:
diff --git a/source.local/l/atk/atk.SlackBuild b/source.local/l/atk/atk.SlackBuild
index 1340b08..c95c423 100755
--- a/source.local/l/atk/atk.SlackBuild
+++ b/source.local/l/atk/atk.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=atk
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.6.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -71,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG/usr
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -94,13 +95,34 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-#gzip -9 $PKG/usr/man/man?/*
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* 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
 
diff --git a/source.local/l/attica/attica.SlackBuild b/source.local/l/attica/attica.SlackBuild
new file mode 100755
index 0000000..5282232
--- /dev/null
+++ b/source.local/l/attica/attica.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Copyright 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 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=attica
+VERSION=${VERSION:-0.4.1}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -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 build
+cd build
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
+  PATH=$QTDIR/bin:$PATH \
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS* COPYING* README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/attica/slack-desc b/source.local/l/attica/slack-desc
new file mode 100644
index 0000000..18aedb8
--- /dev/null
+++ b/source.local/l/attica/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 ':'.
+
+      |-----handy-ruler-------------------------------------------------------|
+attica: attica (Qt Collaboration library)
+attica: 
+attica: Attica is a Qt library that implements the freedesktop.org
+attica: specification for the Open Collaboration Services API version 1.4.
+attica: It grants easy access to the services such as querying information
+attica: about persons and contents.
+attica:
+attica: Homepage: http://www.kde.org
+attica:
+attica:
+attica:
diff --git a/source.local/l/babl/babl.SlackBuild b/source.local/l/babl/babl.SlackBuild
index 78f7f2a..3fbffac 100755
--- a/source.local/l/babl/babl.SlackBuild
+++ b/source.local/l/babl/babl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2008, 2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
@@ -25,38 +25,39 @@
 
 
 PKGNAM=babl
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.1.10}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -82,15 +83,16 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# I'm not sure about --enable-sse  
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --enable-mmx \
-  --disable-sse \
   --build=$TARGET
+  # Trust defaults:
+  #--enable-mmx \
+  #--disable-sse \
+  #--enable-introspection \
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG
@@ -103,6 +105,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
 
diff --git a/source.local/l/boost/boost.SlackBuild b/source.local/l/boost/boost.SlackBuild
index e15fe9b..8ce97af 100755
--- a/source.local/l/boost/boost.SlackBuild
+++ b/source.local/l/boost/boost.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2007, 2008 Eric Hameleers, Eindhoven, NL
-# Copyright 2007-2008 Heinz Wiesinger
+# Copyright 2007, 2008, 2012, 2013 Eric Hameleers, Eindhoven, NL
+# Copyright 2007-2012 Heinz Wiesinger
 # Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -28,41 +28,49 @@
 
 
 PKGNAM=boost
-VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d _)}
+VERSION=${VERSION:-1_53_0}
 BUILD=${BUILD:-1}
 
-ICU=${ICU:-no}
-PKG_VERSION=$(echo $VERSION | tr _ .)	# Leave this alone
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+ICU=${ICU:-yes}
+PKG_VERSION=$(echo $VERSION | tr _ .)	# Leave this alone
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-boost
@@ -91,28 +99,19 @@ PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
 PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
 
 # First build bjam, the boost build system:
-cd tools/build/v2/engine/src
+cd tools/build/v2/engine
   CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh cc
 cd -
 
-BJAM=$(find tools/build/v2/engine/src/ -name bjam -a -type f)
+BJAM=$(find tools/build/v2/engine/ -name bjam -a -type f)
 
 # Create build subdirectory
 mkdir obj
 
-# Change the build options from 'minimal' to what we want, since adding
-# "-sBUILD=<optimization>speed <inlining>full <threading>single/multi
-# <link>shared <runtime-link>shared" to $BJAM command no longer seems to work.
-FLAGS="<threading>multi <threading>single <optimization>speed <inlining>full"
-sed -i "s/    <threading>multi/    $FLAGS/" Jamroot
-# Disable static libraries ( the only software that *requires* the static libs,
-# is Microsoft's CW compiler (CW or Comega is an experimental language which
-# extends C# )
-sed -i "s/<link>shared <link>static/<link>shared/" Jamroot
-
 # Next, we build boost using bjam
 $BJAM \
   release \
+  $NUMJOBS \
   "-sNO_COMPRESSION=0" \
   "-sZLIB_INCLUDE=/usr/include" \
   "-sZLIB_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
@@ -120,12 +119,16 @@ $BJAM \
   "-sBZIP2_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
   "-sEXPAT_INCLUDE=/usr/include" \
   "-sEXPAT_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
-  --toolset=gcc \
   --layout=system \
   --builddir=obj \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --build-type=minimal \
+  toolset=gcc \
+  variant=release \
+  link=shared \
+  threading=multi \
+  runtime-link=shared \
   $PYTHON_FLAGS \
   stage
 
@@ -136,12 +139,16 @@ $BJAM \
   release \
   "-sEXPAT_INCLUDE=/usr/include" \
   "-sEXPAT_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
-  --toolset=gcc \
   --layout=system \
   --builddir=obj \
   --prefix=$PKG/usr \
   --libdir=$PKG/usr/lib${LIBDIRSUFFIX} \
   --build-type=minimal \
+  toolset=gcc \
+  variant=release \
+  link=shared \
+  threading=multi \
+  runtime-link=shared \
   $PYTHON_FLAGS \
   install
 
diff --git a/source.local/l/cairo/cairo-1.10.0-buggy_gradients.patch.gz b/source.local/l/cairo/cairo-1.10.0-buggy_gradients.patch.gz
deleted file mode 100644
index 82c6a39..0000000
--- a/source.local/l/cairo/cairo-1.10.0-buggy_gradients.patch.gz
+++ /dev/null
diff --git a/source.local/l/cairo/cairo.SlackBuild b/source.local/l/cairo/cairo.SlackBuild
index 34a507d..004470a 100755
--- a/source.local/l/cairo/cairo.SlackBuild
+++ b/source.local/l/cairo/cairo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=cairo
-VERSION=1.10.2
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.12.14}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -80,10 +81,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Thanks to Ubuntu for this, but I found it at Gentoo's bugtracker
-# http://bugs.gentoo.org/show_bug.cgi?id=336696
-zcat $CWD/cairo-1.10.0-buggy_gradients.patch.gz | patch -p1 || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -96,21 +93,22 @@ CFLAGS="$SLKCFLAGS" \
   --disable-win32 \
   --disable-trace \
   --enable-xlib \
-  --enable-freetype \
+  --enable-xcb \
+  --enable-xcb-shm \
+  --enable-xlib-xcb \
   --enable-ps \
   --enable-pdf \
   --enable-svg \
   --enable-tee \
   --enable-gobject \
+  --enable-xml \
   --build=$TARGET
+
 # None of these are 'stable' yet...
 #  --enable-qt \
 #  --enable-gl \
 #  --enable-drm \
-#  --enable-xcb \
-#  --enable-xlib-xcb \
-#  --enable-xcb-drm \
-#  --enable-drm-xr \
+
 # Skipping this, because it causes a dependency on the specific
 # version of binutils installed at compile time:
 #  --enable-trace
@@ -127,6 +125,13 @@ cp -a \
   $PKG/usr/doc/$PKGNAM-$VERSION
 ( cd $PKG/usr/doc/$PKGNAM-$VERSION ; ln -sf /usr/share/gtk-doc/html/cairo html )
 
+# We do not need the entire NEWS file.
+if [ -r NEWS ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+  touch -r NEWS $DOCSDIR/NEWS
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source.local/l/cairo/paredown.sh b/source.local/l/cairo/paredown.sh
new file mode 100755
index 0000000..a243697
--- /dev/null
+++ b/source.local/l/cairo/paredown.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Copyright 2013  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.
+
+# Remove the reference PNG files from the cairo source tarball.
+# These are used only for build time testing, and cairo always fails
+# a large number of tests, making these files more or less useless to
+# the average end user.  If you really need them for some reason, you
+# can fetch the original tarball from cairographics.org.
+#
+# Removing these files reduces the size of the source tarball by 93%.
+
+PKGNAM=cairo
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+
+if [ ! -r $PKGNAM-$VERSION.tar.xz ]; then
+  echo "$PKGNAM-$VERSION.tar.xz is not a cairo tarball.  Exiting."
+  exit 1
+fi
+
+touch -r $PKGNAM-$VERSION.tar.xz tmp-timestamp || exit 1
+
+rm -rf $PKGNAM-$VERSION
+tar xvf $PKGNAM-$VERSION.tar.xz || exit 1
+rm -f $PKGNAM-$VERSION/test/reference/*
+rm -f $PKGNAM-$VERSION.tar.xz
+tar cvf $PKGNAM-$VERSION.tar $PKGNAM-$VERSION
+touch -r tmp-timestamp $PKGNAM-$VERSION.tar
+xz -9 -v $PKGNAM-$VERSION.tar
+rm -rf $PKGNAM-$VERSION tmp-timestamp
+
+echo "Repacking of $PKGNAM-$VERSION.tar.xz complete."
+
diff --git a/source.local/l/clucene/clucene.SlackBuild b/source.local/l/clucene/clucene.SlackBuild
index f5e4ab3..4e39642 100755
--- a/source.local/l/clucene/clucene.SlackBuild
+++ b/source.local/l/clucene/clucene.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,50 +23,45 @@
 
 # Modified by Robby Workman <rworkman@slackware.com> 
 # No added terms or copyright claims
-
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=clucene
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.3.3.4}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+NUMJOBS=${NUMJOBS:--j7}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -74,9 +69,13 @@ PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PKGNAM-core-$VERSION
-tar xvf $CWD/$PKGNAM-core-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-core-$VERSION || exit 1
+rm -rf ${PKGNAM}-src-$VERSION
+tar xvf $CWD/${PKGNAM}-src-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-src-$VERSION || exit 1
+
+# Fix the pkgconfig file by adding required shared library.
+cat $CWD/clucene.pkgconfig.patch | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -84,25 +83,27 @@ find . \
   \( -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 \
-  --disable-static \
-  --build=$TARGET
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  APACHE.license AUTHORS COPYING* HACKING INSTALL \
+  APACHE.license AUTHORS COPYING* ChangeLog INSTALL \
   LGPL.license NEWS README* REQUESTS \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
diff --git a/source.local/l/clucene/clucene.info b/source.local/l/clucene/clucene.info
deleted file mode 100644
index 52478e8..0000000
--- a/source.local/l/clucene/clucene.info
+++ /dev/null
@@ -1,5 +0,0 @@
-PRGNAM="clucene"
-VERSION="0.9.20"
-HOMEPAGE="http://clucene.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/clucene/clucene-core-0.9.20.tar.bz2"
-MD5SUM="da62da5d23b17fec67f0175481a603b8"
diff --git a/source.local/l/clucene/clucene.pkgconfig.patch b/source.local/l/clucene/clucene.pkgconfig.patch
new file mode 100644
index 0000000..6144479
--- /dev/null
+++ b/source.local/l/clucene/clucene.pkgconfig.patch
@@ -0,0 +1,24 @@
+From 7be4a19b76d98260cf95040a47935f854a4ba7a4 Mon Sep 17 00:00:00 2001
+From: Valentin Rusu <kde@rusu.info>
+Date: Sat, 17 Dec 2011 13:47:58 +0100
+Subject: [PATCH] Fix .pc file by adding clucene-shared library
+
+---
+ src/core/libclucene-core.pc.cmake |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/core/libclucene-core.pc.cmake b/src/core/libclucene-core.pc.cmake
+index 0152b25..d421e70 100644
+--- a/src/core/libclucene-core.pc.cmake
++++ b/src/core/libclucene-core.pc.cmake
+@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/include/CLucene/ext
+ Name: libclucene
+ Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
+ Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@
+-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
+ Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
+ ~
+-- 
+1.7.8
+
diff --git a/source.local/l/clucene/slack-desc b/source.local/l/clucene/slack-desc
index 5d1d1a2..4d20e0a 100644
--- a/source.local/l/clucene/slack-desc
+++ b/source.local/l/clucene/slack-desc
@@ -1,3 +1,10 @@
+# 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----------------------------------------------------|
 clucene: clucene (Text-Search Engine)
 clucene:
diff --git a/source.local/l/dbus-glib/dbus-glib.SlackBuild b/source.local/l/dbus-glib/dbus-glib.SlackBuild
index 13c9e00..3dd843f 100755
--- a/source.local/l/dbus-glib/dbus-glib.SlackBuild
+++ b/source.local/l/dbus-glib/dbus-glib.SlackBuild
@@ -25,38 +25,39 @@
 
 
 PKGNAM=dbus-glib
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.100.2}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -99,7 +100,20 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-gzip -9 $PKG/usr/man/man?/*.?
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
@@ -109,6 +123,14 @@ cp -a \
   ln -s ../../share/gtk-doc/html/dbus-glib/ html
 )
 
+# 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
 
diff --git a/source.local/l/dbus-python/dbus-python.SlackBuild b/source.local/l/dbus-python/dbus-python.SlackBuild
index 77372be..3e88615 100755
--- a/source.local/l/dbus-python/dbus-python.SlackBuild
+++ b/source.local/l/dbus-python/dbus-python.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,39 +26,40 @@
 
 # http://dbus.freedesktop.org/releases/dbus-python/
 
-PRGNAM=dbus-python
-VERSION=${VERSION:-0.83.1}
+PKGNAM=dbus-python
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -68,14 +69,14 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP || exit 1
-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 \) \
@@ -90,7 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
   --enable-shared=yes \
   --enable-static=no \
   --build=$TARGET \
@@ -103,14 +104,22 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* INSTALL NEWS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $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
 
 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.local/l/dconf/dconf.SlackBuild b/source.local/l/dconf/dconf.SlackBuild
new file mode 100755
index 0000000..907d2ae
--- /dev/null
+++ b/source.local/l/dconf/dconf.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011  David Somero (dsomero@hotmail.com) Athens, TN, 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=dconf
+VERSION=${VERSION:-0.14.1}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/$PKGNAM-$VERSION \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+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/$PKGNAM-$VERSION
+cp -a COPYING* NEWS README* $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 | sed "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX}," > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/dconf/dconf.url b/source.local/l/dconf/dconf.url
new file mode 100644
index 0000000..faabca9
--- /dev/null
+++ b/source.local/l/dconf/dconf.url
@@ -0,0 +1,2 @@
+http://live.gnome.org/dconf
+ftp://ftp.gnome.org/pub/gnome/sources/dconf/
diff --git a/source.local/l/dconf/doinst.sh.gz b/source.local/l/dconf/doinst.sh.gz
new file mode 100644
index 0000000..f54aef6
--- /dev/null
+++ b/source.local/l/dconf/doinst.sh.gz
diff --git a/source.local/l/dconf/slack-desc b/source.local/l/dconf/slack-desc
new file mode 100644
index 0000000..4ab563a
--- /dev/null
+++ b/source.local/l/dconf/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------------------------------------------------------|
+dconf: dconf (low-level configuration system)
+dconf:
+dconf: dconf is a low-level configuration system. Its main purpose is to
+dconf: provide a backend to the GSettings API in GLib.
+dconf:
+dconf: Homepage: http://live.gnome.org/dconf
+dconf:
+dconf:
+dconf:
+dconf:
+dconf:
diff --git a/source.local/l/desktop-file-utils/desktop-file-utils.SlackBuild b/source.local/l/desktop-file-utils/desktop-file-utils.SlackBuild
index 1fd1e46..f5bbf20 100755
--- a/source.local/l/desktop-file-utils/desktop-file-utils.SlackBuild
+++ b/source.local/l/desktop-file-utils/desktop-file-utils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,33 +24,39 @@
 
 
 PKGNAM=desktop-file-utils
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.21}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/djvulibre/djvulibre.SlackBuild b/source.local/l/djvulibre/djvulibre.SlackBuild
index b34a29c..3b66b3e 100755
--- a/source.local/l/djvulibre/djvulibre.SlackBuild
+++ b/source.local/l/djvulibre/djvulibre.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,36 +25,37 @@
 
 
 PKGNAM=djvulibre
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-3.5.25.3}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -69,9 +70,9 @@ PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP || exit 1
-rm -rf $PKGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION || rm -rf $PKGNAM-$(echo $VERSION | rev | cut -f 2- -d . | rev)
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
+cd $PKGNAM-$VERSION || cd $PKGNAM-$(echo $VERSION | rev | cut -f 2- -d . | rev) || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -97,6 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-qt=/usr/lib${LIBDIRSUFFIX}/qt \
   --build=$TARGET
 
+make clean || exit 1
 make depend || exit 1
 make || exit 1 # This isn't fully compatible with threaded make
 make install DESTDIR=$PKG || exit 1
diff --git a/source.local/l/ebook-tools/ebook-tools.SlackBuild b/source.local/l/ebook-tools/ebook-tools.SlackBuild
index 2ebf97a..27091d8 100755
--- a/source.local/l/ebook-tools/ebook-tools.SlackBuild
+++ b/source.local/l/ebook-tools/ebook-tools.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2010  Eric Hameleers, Eindhoven, NL
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2013  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,46 +25,47 @@
 
 
 PKGNAM=ebook-tools
-VERSION=${VERSION:-0.1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.2.2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
diff --git a/source.local/l/ebook-tools/ebook-tools.paths.diff b/source.local/l/ebook-tools/ebook-tools.paths.diff
deleted file mode 100644
index 3752b10..0000000
--- a/source.local/l/ebook-tools/ebook-tools.paths.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ebook-tools-0.1.1/src/libepub/CMakeLists.txt ebook-tools-0.1.1.rmhardcoded/src/libepub/CMakeLists.txt
---- ebook-tools-0.1.1/src/libepub/CMakeLists.txt	2008-06-07 20:20:14.000000000 +0100
-+++ ebook-tools-0.1.1.rmhardcoded/src/libepub/CMakeLists.txt	2008-12-15 02:59:58.621077025 +0000
-@@ -4,5 +4,5 @@
- 
- set_target_properties (epub PROPERTIES VERSION 0.1.1 SOVERSION 0)
- 
--install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
--install ( FILES epub.h epub_shared.h DESTINATION include )
-+install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} )
-+install ( FILES epub.h epub_shared.h DESTINATION ${INCLUDE_INSTALL_DIR} )
-
diff --git a/source.local/l/ebook-tools/slack-desc b/source.local/l/ebook-tools/slack-desc
index abb2ef8..374d507 100644
--- a/source.local/l/ebook-tools/slack-desc
+++ b/source.local/l/ebook-tools/slack-desc
@@ -10,10 +10,10 @@ ebook-tools: ebook-tools (access and convert various ebook file formats)
 ebook-tools:
 ebook-tools: Tools for accessing and converting various ebook file formats. 
 ebook-tools:
+ebook-tools: Home page: http://sourceforge.net/projects/ebook-tools/
 ebook-tools:
 ebook-tools:
 ebook-tools:
 ebook-tools:
 ebook-tools:
-ebook-tools: Home page: http://sourceforge.net/projects/ebook-tools/
 ebook-tools:
diff --git a/source.local/l/exiv2/exiv2.SlackBuild b/source.local/l/exiv2/exiv2.SlackBuild
index 77496b9..ee0df6d 100755
--- a/source.local/l/exiv2/exiv2.SlackBuild
+++ b/source.local/l/exiv2/exiv2.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,36 +25,37 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 PKGNAM=exiv2
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.23}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -106,16 +107,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  COPYING* README \
-  doc/{templates,COPYING-XMPSDK,README-XMP,cmd.txt,cmdxmp.txt} \
+  COPYING* README* \
+  doc/{COPYING-XMPSDK,README-XMP,cmd.txt,cmdxmp.txt} \
   $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
+if [ -r doc/ChangeLog ]; then
   DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
+  cat doc/ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r doc/ChangeLog $DOCSDIR/ChangeLog
 fi
 
 mkdir -p $PKG/install
diff --git a/source.local/l/fribidi/fribidi.SlackBuild b/source.local/l/fribidi/fribidi.SlackBuild
index e246e78..cace77a 100755
--- a/source.local/l/fribidi/fribidi.SlackBuild
+++ b/source.local/l/fribidi/fribidi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=fribidi
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.19.2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
@@ -68,26 +69,53 @@ cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION
+
+zcat $CWD/fribidi.glib.h.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
 find . -perm 775 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
 chown -R root:root .
+
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --disable-static \
   --with-pic
+
 make $NUMJOBS || exit 1
 make install DESTDIR=$PKG
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
-strip -g $PKG/usr/lib/libfribidi.a
+
+# Remove any zero length man pages:
+find $PKG/usr/man/ -type f -empty -delete
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* NEWS README* THANKS TODO \
   $PKG/usr/doc/$PKGNAM-$VERSION
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source.local/l/fribidi/fribidi.glib.h.diff.gz b/source.local/l/fribidi/fribidi.glib.h.diff.gz
new file mode 100644
index 0000000..811395d
--- /dev/null
+++ b/source.local/l/fribidi/fribidi.glib.h.diff.gz
diff --git a/source.local/l/gamin/fix-double-lock-in-inotify-helper-c.patch.gz b/source.local/l/gamin/fix-double-lock-in-inotify-helper-c.patch.gz
new file mode 100644
index 0000000..db47bc7
--- /dev/null
+++ b/source.local/l/gamin/fix-double-lock-in-inotify-helper-c.patch.gz
diff --git a/source.local/l/gamin/gamin.SlackBuild b/source.local/l/gamin/gamin.SlackBuild
index f6049ab..707c50a 100755
--- a/source.local/l/gamin/gamin.SlackBuild
+++ b/source.local/l/gamin/gamin.SlackBuild
@@ -25,38 +25,39 @@
 
 
 PKGNAM=gamin
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.1.10}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -74,7 +75,7 @@ mkdir -p $TMP $PKG
 cd $TMP 
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -82,6 +83,12 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=786170
+zcat $CWD/fix-double-lock-in-inotify-helper-c.patch.gz | patch -p1 --verbose || exit 1
+
+# Fix a build error with newer toolchain
+zcat $CWD/no_g_const_return.patch.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source.local/l/gamin/no_g_const_return.patch.gz b/source.local/l/gamin/no_g_const_return.patch.gz
new file mode 100644
index 0000000..547382a
--- /dev/null
+++ b/source.local/l/gamin/no_g_const_return.patch.gz
diff --git a/source.local/l/gcr/doinst.sh.gz b/source.local/l/gcr/doinst.sh.gz
new file mode 100644
index 0000000..a93a871
--- /dev/null
+++ b/source.local/l/gcr/doinst.sh.gz
diff --git a/source.local/l/gcr/gcr.SlackBuild b/source.local/l/gcr/gcr.SlackBuild
new file mode 100755
index 0000000..de33bc2
--- /dev/null
+++ b/source.local/l/gcr/gcr.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/sh
+
+# Slackware build script for gcr
+
+# 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=gcr
+VERSION=${VERSION:-3.6.2}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/$PKGNAM-$VERSION \
+  --disable-schemas-compile \
+  --disable-update-mime \
+  --disable-update-icon-cache \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING INSTALL NEWS README* \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source.local/l/gcr/slack-desc b/source.local/l/gcr/slack-desc
new file mode 100644
index 0000000..2cddcf4
--- /dev/null
+++ b/source.local/l/gcr/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------------------------------------------------------|
+gcr: gcr (crypto library and ui for gnome-keyring)
+gcr:
+gcr: GCR is a library for displaying certificates and crypto UI accessing
+gcr: key stores. It also provides the viewer for crypto files on the GNOME
+gcr: desktop.
+gcr:
+gcr: GCK is a library for accessing PKCS#11 modules like smart cards, in a
+gcr: (G)object oriented way.
+gcr:
+gcr:
+gcr:
diff --git a/source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
index 272ee27..aff19c8 100755
--- a/source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
+++ b/source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for gdk-pixbuf
-
-# Copyright 2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2010, 2011  Robby Workman, Northport, Alabama, USA
 # Copyright 2010, 2011  Patrick Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
@@ -27,38 +25,39 @@
 
 
 PKGNAM=gdk-pixbuf
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.26.5}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -96,7 +95,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-introspection \
+  --enable-introspection \
+  --with-x11 \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
@@ -128,14 +128,34 @@ chmod 0755 $PKG/usr/bin/update-gdk-pixbuf-loaders
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* INSTALL NEWS README* \
   $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.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders b/source.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
index b19d368..5848db8 100644
--- a/source.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
+++ b/source.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
@@ -21,6 +21,10 @@ case "$host" in
      /usr/bin/gdk-pixbuf-query-loaders-64 --update-cache
      # Check for x86_64 multilib:
      if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then
+       for d in $(ls -d /etc/pango/i?86*); do
+         mlhost=$(basename $d)
+         break
+       done
        if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then
          if [ "$1" = "--verbose" ]; then
            echo "Updating gdk-pixbuf.loaders for ${mlhost}:"
diff --git a/source.local/l/gegl/gegl.SlackBuild b/source.local/l/gegl/gegl.SlackBuild
index 5186da0..d812795 100755
--- a/source.local/l/gegl/gegl.SlackBuild
+++ b/source.local/l/gegl/gegl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2008, 2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
@@ -25,38 +25,39 @@
 
 
 PKGNAM=gegl
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -89,9 +90,10 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --enable-gtk-doc \
   --disable-docs \
-  --enable-mmx \
-  --disable-sse \
   --build=$TARGET || exit 1
+  # Trust defaults:
+  #--enable-mmx \
+  #--disable-sse \
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source.local/l/gegl/slack-desc b/source.local/l/gegl/slack-desc
index 0d7e598..75eea8a 100644
--- a/source.local/l/gegl/slack-desc
+++ b/source.local/l/gegl/slack-desc
@@ -11,7 +11,7 @@ gegl:
 gegl: GEGL (Generic Graphics Library) is a graph based image processing
 gegl: framework.
 gegl: 
-gegl: GEGL provides infratructure to do demand based cached non destructive
+gegl: GEGL provides infrastructure to do demand based cached non destructive
 gegl: image editing on larger than RAM buffers. Through babl it provides
 gegl: support for a wide range of color models and pixel storage formats for
 gegl: input and output.
diff --git a/source.local/l/glade3/glade3.SlackBuild b/source.local/l/glade3/glade3.SlackBuild
new file mode 100755
index 0000000..70403f8
--- /dev/null
+++ b/source.local/l/glade3/glade3.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# Slackware build script for glade3
+
+# Copyright 2010, 2011  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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=glade3
+VERSION=${VERSION:-3.8.3}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/$PKGNAM-$VERSION \
+  --disable-scrollkeeper \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/glade3/slack-desc b/source.local/l/glade3/slack-desc
new file mode 100644
index 0000000..f31e2eb
--- /dev/null
+++ b/source.local/l/glade3/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 ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+glade3: glade3 (Glade UI Designer version 3)
+glade3:
+glade3: Glade is a RAD tool to enable quick and easy development of user
+glade3: interfaces for the GTK+ toolkit and the GNOME desktop environment.
+glade3: The user interfaces designed in Glade are saved as XML, and by using
+glade3: the GtkBuilder GTK+ object these can be loaded by applications
+glade3: dynamically as needed.
+glade3:
+glade3: Homepage: http://glade.gnome.org/
+glade3:
+glade3:
diff --git a/source.local/l/glib2/glib2.SlackBuild b/source.local/l/glib2/glib2.SlackBuild
index 5917b1f..72dc3cf 100755
--- a/source.local/l/glib2/glib2.SlackBuild
+++ b/source.local/l/glib2/glib2.SlackBuild
@@ -23,7 +23,7 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.34.3}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source.local/l/gnome-icon-theme/gnome-icon-theme.SlackBuild b/source.local/l/gnome-icon-theme/gnome-icon-theme.SlackBuild
index be526cf..5e4b49f 100755
--- a/source.local/l/gnome-icon-theme/gnome-icon-theme.SlackBuild
+++ b/source.local/l/gnome-icon-theme/gnome-icon-theme.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,10 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo gnome-icon-theme-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=3.6.2	# main package version
+SYMVERS=3.6.2	# gnome-icon-theme-symbolic version
+EXTRAVERS=3.6.2	# gnome-icon-theme-extras version
+
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -54,40 +57,39 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf gnome-icon-theme-$VERSION
-tar xvf $CWD/gnome-icon-theme-$VERSION.tar.?z* || exit 1
-cd gnome-icon-theme-$VERSION || 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 {} \;
-
-# Use the "old" /usr/lib/pkgconfig instead of the /usr/share/pkgconfig
-zcat $CWD/gnome-icon-theme.pkgconfig.path.diff.gz | patch -p1 --verbose || exit 1
-
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --enable-icon-mapping \
-  --localstatedir=/var/lib || exit 1
 
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-mkdir -p $PKG/usr/doc/gnome-icon-theme-$VERSION
-cp -a \
-  AUTHORS COPYING* NEWS README* TODO \
-  $PKG/usr/doc/gnome-icon-theme-$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
+for ICONPKG in gnome-icon-theme-$VERSION gnome-icon-theme-symbolic-$SYMVERS gnome-icon-theme-extras-$EXTRAVERS ; do
+  tar xvf $CWD/$ICONPKG.tar.?z* || exit 1
+  cd $ICONPKG || 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 {} \;
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --enable-icon-mapping \
+    --localstatedir=/var/lib || exit 1
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+  mkdir -p $PKG/usr/doc/$ICONPKG
+  cp -a \
+    AUTHORS COPYING* NEWS README* TODO \
+    $PKG/usr/doc/$ICONPKG
+  if [ -r ChangeLog ]; then
+    cat ChangeLog | head -n 1000 > $PKG/usr/doc/$ICONPKG/ChangeLog
+    touch -r ChangeLog $PKG/usr/doc/$ICONPKG/ChangeLog
+  fi
+  cd ..
+done
+
+# It's a bad idea to ship these in the packages.  If they aren't kept
+# updated, there will be missing icons.  Let the user create them if
+# they care to.
+find $PKG -name icon-theme.cache -exec rm "{}" \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source.local/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff.gz b/source.local/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff.gz
deleted file mode 100644
index 865c1b5..0000000
--- a/source.local/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff.gz
+++ /dev/null
diff --git a/source.local/l/gnome-keyring/doinst.sh.gz b/source.local/l/gnome-keyring/doinst.sh.gz
new file mode 100644
index 0000000..0658eb3
--- /dev/null
+++ b/source.local/l/gnome-keyring/doinst.sh.gz
diff --git a/source.local/l/gnome-keyring/gnome-keyring.SlackBuild b/source.local/l/gnome-keyring/gnome-keyring.SlackBuild
new file mode 100755
index 0000000..10b085f
--- /dev/null
+++ b/source.local/l/gnome-keyring/gnome-keyring.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Slackware build script for gnome-keyring
+
+# Copyright 2010, 2011  Robby Workman, Northport, Alabama, USA
+# Copyright 2012  Patrick J. Volkerding, Sebeka, MN, USA
+#
+# 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=gnome-keyring
+VERSION=${VERSION:-3.6.3}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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 \
+  --disable-static \
+  --enable-shared \
+  --enable-nls \
+  --disable-debug \
+  --enable-ssh-agent \
+  --with-root-certs=/etc/ssl/certs \
+  --with-pam-dir=/lib/security \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/etc/gconf/gconf.xml.defaults
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS README* COPYING* HACKING INSTALL NEWS \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -p -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/gnome-keyring/slack-desc b/source.local/l/gnome-keyring/slack-desc
new file mode 100644
index 0000000..33e06ef
--- /dev/null
+++ b/source.local/l/gnome-keyring/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 ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+gnome-keyring: GNOME Keyring (a tool to handle security credentials)
+gnome-keyring:
+gnome-keyring: GNOME Keyring is a program designed to take care of the user's
+gnome-keyring: security credentials, such as user names and passwords, in an
+gnome-keyring: easy to access manner.  The keyring is implemented as a daemon
+gnome-keyring: and uses the process name gnome-keyring-daemon.
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
diff --git a/source.local/l/grantlee/grantlee.SlackBuild b/source.local/l/grantlee/grantlee.SlackBuild
new file mode 100755
index 0000000..1febd4e
--- /dev/null
+++ b/source.local/l/grantlee/grantlee.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Copyright 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012  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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=grantlee
+VERSION=${VERSION:-0.3.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -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 build
+cd build
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
+  PATH=$QTDIR/bin:$PATH \
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS CHANGELOG COPYING* GOALS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/grantlee/slack-desc b/source.local/l/grantlee/slack-desc
new file mode 100644
index 0000000..445d141
--- /dev/null
+++ b/source.local/l/grantlee/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 ':'.
+
+        |-----handy-ruler-------------------------------------------------------|
+grantlee: grantlee (string template engine)
+grantlee: 
+grantlee: Grantlee is a plugin based String Template system written using the
+grantlee: Qt framework.  The goals of the project are to make it easier for
+grantlee: application developers to separate the structure of documents from
+grantlee: the data they contain, opening the door for theming.
+grantlee:
+grantlee: Homepage: http://gitorious.org/grantlee/
+grantlee:
+grantlee:
+grantlee:
diff --git a/source.local/l/gsettings-desktop-schemas/doinst.sh.gz b/source.local/l/gsettings-desktop-schemas/doinst.sh.gz
new file mode 100644
index 0000000..cad78fa
--- /dev/null
+++ b/source.local/l/gsettings-desktop-schemas/doinst.sh.gz
diff --git a/source.local/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild b/source.local/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild
new file mode 100755
index 0000000..fcab3ee
--- /dev/null
+++ b/source.local/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for gsettings-desktop-schemas
+
+# 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=gsettings-desktop-schemas
+VERSION=${VERSION:-3.6.1}
+BUILD=${BUILD:-1}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/$PKGNAM-$VERSION \
+  --build=$TARGET || exit 1
+
+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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING MAINTAINERS NEWS README* \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/gsettings-desktop-schemas/slack-desc b/source.local/l/gsettings-desktop-schemas/slack-desc
new file mode 100644
index 0000000..4d0d3b9
--- /dev/null
+++ b/source.local/l/gsettings-desktop-schemas/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------------------------------------------------------|
+gsettings-desktop-schemas: gsettings-desktop-schemas (GSettings schemas)
+gsettings-desktop-schemas:
+gsettings-desktop-schemas: gsettings-desktop-schemas contains a collection of GSettings schemas 
+gsettings-desktop-schemas: for settings shared by various components of a desktop.
+gsettings-desktop-schemas:
+gsettings-desktop-schemas: 
+gsettings-desktop-schemas:
+gsettings-desktop-schemas:
+gsettings-desktop-schemas:
+gsettings-desktop-schemas:
+gsettings-desktop-schemas:
diff --git a/source.local/l/gst-plugins-base/gst-plugins-base.SlackBuild b/source.local/l/gst-plugins-base/gst-plugins-base.SlackBuild
index b4d51c9..3513661 100755
--- a/source.local/l/gst-plugins-base/gst-plugins-base.SlackBuild
+++ b/source.local/l/gst-plugins-base/gst-plugins-base.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008 Michiel van Wessem <michiel@slackbuilds.org>
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,41 +27,39 @@
 
 
 PKGNAM=gst-plugins-base
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.10.36}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -104,10 +102,20 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
diff --git a/source.local/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff.gz b/source.local/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff.gz
deleted file mode 100644
index 29521bf..0000000
--- a/source.local/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff.gz
+++ /dev/null
diff --git a/source.local/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source.local/l/gst-plugins-good/gst-plugins-good.SlackBuild
index 9a3c917..27afb79 100755
--- a/source.local/l/gst-plugins-good/gst-plugins-good.SlackBuild
+++ b/source.local/l/gst-plugins-good/gst-plugins-good.SlackBuild
@@ -27,41 +27,39 @@
 
 
 PKGNAM=gst-plugins-good
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.10.31}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -80,8 +78,6 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION
 
-zcat $CWD/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -124,7 +120,7 @@ fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* RELEASE REQUIREMENTS \
+  AUTHORS COPYING* INSTALL NEWS README* RELEASE REQUIREMENTS \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source.local/l/gstreamer/gstreamer.SlackBuild b/source.local/l/gstreamer/gstreamer.SlackBuild
index f16d808..21653bb 100755
--- a/source.local/l/gstreamer/gstreamer.SlackBuild
+++ b/source.local/l/gstreamer/gstreamer.SlackBuild
@@ -26,41 +26,39 @@
 
 
 PKGNAM=gstreamer
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.10.36}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -112,14 +110,24 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL MAINTAINERS NEWS README* RELEASE TODO \
+  AUTHORS COPYING* INSTALL MAINTAINERS NEWS README* RELEASE TODO \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source.local/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff.gz b/source.local/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff.gz
index a9a038a..f2ce232 100644
--- a/source.local/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff.gz
+++ b/source.local/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff.gz
diff --git a/source.local/l/gtk+2/gtk+-2.24.x.icon-compat.diff.gz b/source.local/l/gtk+2/gtk+-2.24.x.icon-compat.diff.gz
index 4cc3eee..5ab5ae7 100644
--- a/source.local/l/gtk+2/gtk+-2.24.x.icon-compat.diff.gz
+++ b/source.local/l/gtk+2/gtk+-2.24.x.icon-compat.diff.gz
diff --git a/source.local/l/gtk+2/gtk+2.SlackBuild b/source.local/l/gtk+2/gtk+2.SlackBuild
index 8f3ae73..20ca14b 100755
--- a/source.local/l/gtk+2/gtk+2.SlackBuild
+++ b/source.local/l/gtk+2/gtk+2.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
@@ -23,38 +23,39 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo gtk+-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.24.17}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -111,7 +112,7 @@ CFLAGS="$SLKCFLAGS -DHOST='"'"${TARGET}"'"'" \
   --mandir=/usr/man \
   --with-xinput=yes \
   --enable-xkb \
-  --disable-introspection \
+  --enable-introspection \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
@@ -128,15 +129,13 @@ make install \
   DESTDIR=$PKG \
   || exit 1
 
-# You'll probably need to install the newly made package right away to
-# fix the result of this next line, but we had to clear this.  Sorry.
-rm -rf /etc/gtk-2.0
-# I'm spamming your root partition because /etc/gtk-2.0 won't install to $DESTDIR...
-make install 
-cp -a /etc/gtk-2.0/* $PKG/etc/gtk-2.0/ || exit 1
-rm -rf $PKG/etc/gtk-2.0/$host
+# This directory needs to exist, or update-gtk-immodules will run into problems:
 mkdir -p $PKG/etc/gtk-2.0/$host
-mv $PKG/etc/gtk-2.0/gtk.immodules $PKG/etc/gtk-2.0/$host/
+
+# If this file exists, move it into the host directory:
+if [ -r $PKG/etc/gtk-2.0/gtk.immodules ]; then
+  mv $PKG/etc/gtk-2.0/gtk.immodules $PKG/etc/gtk-2.0/$host/
+fi
 
 # Don't clobber im-multipress.conf
 mv $PKG/etc/gtk-2.0/im-multipress.conf $PKG/etc/gtk-2.0/im-multipress.conf.new || exit 1
diff --git a/source.local/l/gtk+2/update-gtk-immodules-2.0 b/source.local/l/gtk+2/update-gtk-immodules-2.0
index bc4ad6c..704cfd0 100644
--- a/source.local/l/gtk+2/update-gtk-immodules-2.0
+++ b/source.local/l/gtk+2/update-gtk-immodules-2.0
@@ -8,7 +8,9 @@ host=$(uname -m)-slackware-linux
  
 # Fix $host for arm arch:
 case "$host" in
-  armv7hl) host=armv7hl-slackware-linux-gnueabi ;;
+  armv7l*) hostqq=armv7l-slackware-linux-gnueabi
+           readelf /usr/bin/file -A | grep -q "Tag_FP_arch" && host=armv7hl-slackware-linux-gnueabi
+           ;;
   arm*)    host=arm-slackware-linux-gnueabi ;;
 esac
 
diff --git a/source.local/l/gtk+3/doinst.sh.gz b/source.local/l/gtk+3/doinst.sh.gz
new file mode 100644
index 0000000..36e891e
--- /dev/null
+++ b/source.local/l/gtk+3/doinst.sh.gz
diff --git a/source.local/l/gtk+3/gtk+3.SlackBuild b/source.local/l/gtk+3/gtk+3.SlackBuild
new file mode 100755
index 0000000..1bd4143
--- /dev/null
+++ b/source.local/l/gtk+3/gtk+3.SlackBuild
@@ -0,0 +1,202 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+VERSION=${VERSION:-3.6.4}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-gtk3
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
+cd $TMP
+rm -rf gtk+-$VERSION
+tar xvf $CWD/gtk+-$VERSION.tar.?z* || exit 1
+cd gtk+-$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 {} \;
+
+# Use /etc/gtk-3.0/$TARGET instead of /etc/gtk-3.0/ for gtk.immodules
+zcat $CWD/use_host_triplet_for_gtk_immodules.diff.gz | patch -p1 --verbose || exit 1
+
+# Regenerate ./configure:
+libtoolize --copy --force
+autoreconf -vif
+
+# Autoconf changes linux to linux-gnu.
+# Our host is $ARCH-slackware-linux not $ARCH-slackware-linux-gnu:
+sed -i -e 's#linux|linux-gnu|#linux|linux|#' config.sub
+
+CFLAGS="$SLKCFLAGS -DHOST='"'"${TARGET}"'"'" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --enable-xkb \
+  --enable-packagekit=no \
+  --build=$TARGET \
+  --host=$TARGET \
+  --target=$TARGET
+#  --enable-gtk-doc-html=no \
+
+# See modules/input/Makefile.am
+make \
+  imconffiledir=/etc/gtk-3.0/$TARGET \
+  $NUMJOBS || make || exit 1
+
+# Check the host value that is passed to the compile to the one in this script:
+host="$TARGET"
+# Best I can tell, it doesn't matter if they match.  Since gtk+3-3.2.0, both
+# build_triplet and host_triplet have "-gnu" appended to them, but neither of
+# those seem to actually be used anywhere.  Commenting out unless I find out
+# that I'm wrong later...  :-)   --rworkman
+#compile_host=$(grep 'host_triplet =' gtk/Makefile | sed -e "s/.* = //")
+#if [ "x$compile_host" != "x$host" ]; then
+#  echo "Host mismatch: compile='$compile_host', SlackBuild='$host'" && exit 1
+#fi
+
+make install \
+  imconffiledir=/etc/gtk-3.0/$TARGET \
+  RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false \
+  DESTDIR=$PKG \
+  || exit 1
+
+# You'll probably need to install the newly made package right away to
+# fix the result of this next line, but we had to clear this.  Sorry.
+rm -rf /etc/gtk-3.0
+# I'm spamming your root partition because /etc/gtk-3.0 won't install to $DESTDIR...
+make install imconffiledir=/etc/gtk-3.0/$TARGET
+cp -a /etc/gtk-3.0 $PKG/etc || exit 1
+mv $PKG/etc/gtk-3.0/$host/im-multipress.conf $PKG/etc/gtk-3.0/im-multipress.conf.new
+rm -f $PKG/etc/gtk-3.0/$host/*
+if [ -r $PKG/etc/gtk-3.0/gtk.immodules ]; then
+  mv $PKG/etc/gtk-3.0/gtk.immodules $PKG/etc/gtk-3.0/$host/
+fi
+
+# Install a "starter" gtkrc
+echo 'gtk-theme-name="GTK+"' > $PKG/etc/gtk-3.0/gtkrc.new
+
+# We need to have separate 32-bit and 64-bit binaries
+# for places where we have two copies of the GTK+ package installed.
+# (we might have x86_64 and i486 packages on the same system, for example.)
+case "$host" in
+  s390x*|x86_64*)
+   mv $PKG/usr/bin/gtk-query-immodules-3.0{,-64}
+   ( cd $PKG/usr/bin
+     ln -sf gtk-query-immodules-3.0-64 gtk-query-immodules-3.0
+   )
+   ;;
+  *)
+   mv $PKG/usr/bin/gtk-query-immodules-3.0{,-32}
+   ( cd $PKG/usr/bin
+     ln -sf gtk-query-immodules-3.0-32 gtk-query-immodules-3.0
+   )
+   ;;
+esac
+
+# Install wrappers for the binaries:
+cp $CWD/update-gtk-immodules-3.0 $PKG/usr/bin/update-gtk-immodules-3.0
+chmod 0755 $PKG/usr/bin/update-*
+
+find $PKG | xargs file | egrep "executable|shared object" | grep "ELF" | \
+  cut -d: -f1 | xargs strip --strip-unneeded 2>/dev/null
+
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.*
+      )
+    done
+  )
+fi
+
+# Copy extra documentation into package.
+mkdir -p $PKG/usr/doc/gtk+3-$VERSION
+cp -a \
+  AUTHORS COPYING NEWS README \
+  $PKG/usr/doc/gtk+3-$VERSION
+( cd $PKG/usr/doc/gtk+3-$VERSION
+  ln -s /usr/share/gtk-doc/html/gail-libgail-util .
+  ln -s /usr/share/gtk-doc/html/gdk .
+  ln -s /usr/share/gtk-doc/html/gtk .
+)
+find $PKG/usr/doc/gtk+3-$VERSION/ -type f -exec chmod 644 {} \;
+chown -R root:root $PKG/usr/doc/gtk+3-$VERSION
+
+mkdir -p $PKG/install 
+zcat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -p -l y -c n $TMP/gtk+3-${VERSION}-$ARCH-${BUILD}.txz
diff --git a/source.local/l/gtk+3/slack-desc b/source.local/l/gtk+3/slack-desc
new file mode 100644
index 0000000..4781692
--- /dev/null
+++ b/source.local/l/gtk+3/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 ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+gtk+3: GTK+ version 3 (multi-platform GUI toolkit)
+gtk+3:
+gtk+3: This is GTK+, a multi-platform toolkit for creating graphical user
+gtk+3: interfaces.  Offering a complete set of widgets, GTK+ is suitable for
+gtk+3: projects ranging from small one-off projects to complete application
+gtk+3: suites.
+gtk+3:
+gtk+3:
+gtk+3:
+gtk+3:
+gtk+3:
diff --git a/source.local/l/gtk+3/update-gtk-immodules-3.0 b/source.local/l/gtk+3/update-gtk-immodules-3.0
new file mode 100644
index 0000000..9a01487
--- /dev/null
+++ b/source.local/l/gtk+3/update-gtk-immodules-3.0
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Updates the immodules in /etc/gtk-3.0/$host
+
+umask 022
+
+# Get the machine type from uname:
+host=$(uname -m)-slackware-linux
+ 
+# Fix $host for arm arch:
+case "$host" in
+  armv7l*) hostqq=armv7l-slackware-linux-gnueabi
+           readelf /usr/bin/file -A | grep -q "Tag_FP_arch" && host=armv7hl-slackware-linux-gnueabi
+           ;;
+  arm*)    host=arm-slackware-linux-gnueabi ;;
+esac
+
+# Deriving /etc/gtk-3.0/$host location
+#
+# We have had problems in the past with build systems
+# changing host from i386 to i686 and appending/dropping
+# the -gnu suffix, so try to match up the $host we got
+# with whats actually there.
+if [ ! -d /etc/gtk-3.0/$host ]; then
+   case "$host" in
+     i?86*)
+         for d in $(ls -d /etc/gtk-3.0/i?86*); do
+           host=$(basename $d)
+           break
+         done
+     ;;
+   esac
+fi
+
+FILE=/etc/gtk-3.0/$host/gtk.immodules
+
+case "$host" in
+  s390x*|x86_64*)
+   if [ -x /usr/bin/gtk-query-immodules-3.0-64 ]; then
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gtk.immodules for ${host}:"
+       echo "  /usr/bin/gtk-query-immodules-3.0-64 \\"
+       echo "  > $FILE"
+     fi
+     /usr/bin/gtk-query-immodules-3.0-64 > $FILE
+     # Check for x86_64 multilib:
+     if ls -d /etc/gtk-3.0/i?86* 1> /dev/null 2> /dev/null ; then
+       for d in $(ls -d /etc/gtk-3.0/i?86*); do
+         mlhost=$(basename $d)
+         break
+       done
+       if [ -r /etc/gtk-3.0/$mlhost/gtk.immodules -a \
+       -x /usr/bin/gtk-query-immodules-3.0-32 ]; then
+         FILE=/etc/gtk-3.0/$mlhost/gtk.immodules
+         if [ "$1" = "--verbose" ]; then
+           echo "Updating gtk.immodules for ${mlhost}:"
+           echo "  /usr/bin/gtk-query-immodules-3.0-32 \\"
+           echo "  > $FILE"
+         fi
+         /usr/bin/gtk-query-immodules-3.0-32 > $FILE
+       fi
+     fi
+   else
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gtk.immodules for ${host}:"
+       echo "  /usr/bin/gtk-query-immodules-3.0 \\"
+       echo "  > $FILE"
+     fi
+     /usr/bin/gtk-query-immodules-3.0 > $FILE
+   fi
+   ;;
+  *)
+   if [ -x /usr/bin/gtk-query-immodules-3.0-32 ]; then
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gtk.immodules for ${host}:"
+       echo "  /usr/bin/gtk-query-immodules-3.0-32 \\"
+       echo "  > $FILE"
+     fi
+     /usr/bin/gtk-query-immodules-3.0-32 > $FILE
+   else
+     if [ "$1" = "--verbose" ]; then
+       echo "Updating gtk.immodules for ${host}:"
+       echo "  /usr/bin/gtk-query-immodules-3.0 \\"
+       echo "  > $FILE"
+     fi
+     /usr/bin/gtk-query-immodules-3.0 > $FILE
+   fi
+   ;;
+esac
+
diff --git a/source.local/l/gtk+3/use_host_triplet_for_gtk_immodules.diff.gz b/source.local/l/gtk+3/use_host_triplet_for_gtk_immodules.diff.gz
new file mode 100644
index 0000000..2fd71d2
--- /dev/null
+++ b/source.local/l/gtk+3/use_host_triplet_for_gtk_immodules.diff.gz
diff --git a/source.local/l/gvfs/doinst.sh.gz b/source.local/l/gvfs/doinst.sh.gz
new file mode 100644
index 0000000..d9f61e0
--- /dev/null
+++ b/source.local/l/gvfs/doinst.sh.gz
diff --git a/source.local/l/gvfs/gvfs.SlackBuild b/source.local/l/gvfs/gvfs.SlackBuild
new file mode 100755
index 0000000..3dc4d9e
--- /dev/null
+++ b/source.local/l/gvfs/gvfs.SlackBuild
@@ -0,0 +1,148 @@
+#!/bin/sh
+
+# Copyright 2009-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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=gvfs
+VERSION=${VERSION:-1.14.2}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -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" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-gtk-doc \
+  --disable-hal \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't set AutoMount to true for network volumes.  Doing so leads to long
+# delays in Thunar.  Users may click the network button in Thunar to mount
+# them instead.
+sed -i -e "s/AutoMount=true/AutoMount=false/g" $PKG/usr/share/gvfs/mounts/network.mount
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+mkdir -p $PKG/etc/bash_completion.d/
+mv $PKG/etc/profile.d/gvfs-bash-completion.sh \
+  $PKG/etc/bash_completion.d/gvfs
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL MAINTAINERS 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/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz | sed "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX}," > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/gvfs/slack-desc b/source.local/l/gvfs/slack-desc
new file mode 100644
index 0000000..8d8cd04
--- /dev/null
+++ b/source.local/l/gvfs/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 ':'.
+
+    |-----handy-ruler--------------------------------------------------------|
+gvfs: gvfs (glib virtual filesystems)
+gvfs:
+gvfs: gvfs is a userspace virtual filesystem designed to work with the I/O
+gvfs: abstractions of libgio (a library included in the glib2 package).
+gvfs: It installs several modules that are automatically used by applications
+gvfs: that use the libgio API.  There is also fuse support that allows
+gvfs: applications not using gio to access the gvfs filesystems.
+gvfs:
+gvfs:
+gvfs:
+gvfs:
diff --git a/source.local/l/herqq/herqq-1.0.0.zip b/source.local/l/herqq/herqq-1.0.0.zip
new file mode 100644
index 0000000..687b46a
--- /dev/null
+++ b/source.local/l/herqq/herqq-1.0.0.zip
diff --git a/source.local/l/herqq/herqq.SlackBuild b/source.local/l/herqq/herqq.SlackBuild
new file mode 100755
index 0000000..f8ba4bc
--- /dev/null
+++ b/source.local/l/herqq/herqq.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh 
+
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
+# 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=herqq
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+unzip $CWD/$PKGNAM-$VERSION.zip || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+# Fix 64-bit installation path:
+sed -i -e "s#PREFIX/lib#&${LIBDIRSUFFIX}#" $(find . -name "*.pro")
+
+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 {} \;
+
+qmake PREFIX=/usr
+make $NUMJOBS || make || exit 1
+make install INSTALL_ROOT=$PKG || exit 1
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  hupnp/ChangeLog hupnp/LICENSE_LGPLv3.txt \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/herqq/slack-desc b/source.local/l/herqq/slack-desc
new file mode 100644
index 0000000..1b580c3
--- /dev/null
+++ b/source.local/l/herqq/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 ':'.
+
+     |-----handy-ruler-----------------------------------------------------|
+herqq: herqq (UPnP library)
+herqq:
+herqq: Herqq UPnP (HUPnP) is a software library for building UPnP devices
+herqq: and control points conforming to the UPnP Device Architecture
+herqq: version 1.1.  It is designed to be simple to use and robust in
+herqq: operation.  It is built using C++ and the Qt Framework.
+herqq:
+herqq: Homepage:  http://www.herqq.org/
+herqq:
+herqq:
+herqq:
diff --git a/source.local/l/hunspell/hunspell.SlackBuild b/source.local/l/hunspell/hunspell.SlackBuild
index bcc6999..54fcb27 100755
--- a/source.local/l/hunspell/hunspell.SlackBuild
+++ b/source.local/l/hunspell/hunspell.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2010  Eric Hameleers, Eindhoven, NL
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,38 +25,39 @@
 
 
 PKGNAM=hunspell
-VERSION=${VERSION:-1.2.9}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/hunspell/slack-desc b/source.local/l/hunspell/slack-desc
index b3a4761..eb8f244 100644
--- a/source.local/l/hunspell/slack-desc
+++ b/source.local/l/hunspell/slack-desc
@@ -11,9 +11,9 @@ hunspell:
 hunspell: Hunspell is a spell checker and morphological analyzer library
 hunspell: and program designed for languages with rich morphology
 hunspell: and complex word compounding or character encoding.
-hunspell: Hunspell interfaces: Ispell-like terminal interface using Curses
-hunspell: library, Ispell pipe interface, OpenOffice.org UNO module.
-hunspell:
+hunspell: Hunspell interfaces: Ispell-like terminal interface using ncurses
+hunspell: library, Ispell pipe interface, and OpenOffice.org UNO module.
 hunspell:
 hunspell: Home page: http://hunspell.sourceforge.net/
 hunspell:
+hunspell:
diff --git a/source.local/l/icu4c/icu4c.SlackBuild b/source.local/l/icu4c/icu4c.SlackBuild
new file mode 100755
index 0000000..9db5f33
--- /dev/null
+++ b/source.local/l/icu4c/icu4c.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+# Slackware build script for icu4c
+
+# Copyright 2007-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2012, 2013  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=icu4c
+SRCVER=${SRCVER:-51_1}
+VERSION=$(echo $SRCVER | tr _ .)
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf icu
+tar xvf $CWD/$PKGNAM-$SRCVER-src.tar.xz || exit 1
+cd icu || 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 source/
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --mandir=/usr/man \
+    --enable-shared \
+    --disable-static \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-samples \
+    --build=$TARGET || exit 1
+
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd -
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  license.html readme.html $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/icu4c/slack-desc b/source.local/l/icu4c/slack-desc
new file mode 100644
index 0000000..2d0beef
--- /dev/null
+++ b/source.local/l/icu4c/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 ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+icu4c: icu4c (International Components for Unicode)
+icu4c:
+icu4c: The International Components for Unicode (ICU) libraries provide
+icu4c: robust and full-featured Unicode services on a wide variety of
+icu4c: platforms.
+icu4c:
+icu4c: Homepage: http://www.icu-project.org/
+icu4c:
+icu4c:
+icu4c:
+icu4c:
diff --git a/source.local/l/jasper/jasper.SlackBuild b/source.local/l/jasper/jasper.SlackBuild
index 7b77da5..8ab8e96 100755
--- a/source.local/l/jasper/jasper.SlackBuild
+++ b/source.local/l/jasper/jasper.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007, 2008  Eric Hameleers, Eijdhoven, NL
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 #   Permission to use, copy, modify, and distribute this software for
@@ -26,36 +26,37 @@
 
 
 PKGNAM=jasper
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.900.1}
 BUILD=${BUILD:-3}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/js185/js185-armhf.patch b/source.local/l/js185/js185-armhf.patch
new file mode 100644
index 0000000..ff24b60
--- /dev/null
+++ b/source.local/l/js185/js185-armhf.patch
@@ -0,0 +1,65 @@
+diff -r -U 2 -p a/js/src/configure b/js/src/configure
+--- a/js/src/configure	2011-10-14 18:27:00.000000000 -0400
++++ b/js/src/configure	2011-10-14 18:37:07.264794994 -0400
+@@ -10741,5 +10741,5 @@ _SAVE_CFLAGS="$CFLAGS"
+ if test "$GNU_CC"; then
+   # gcc needs -mfpu=neon to recognize NEON instructions
+-  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
++  CFLAGS="$CFLAGS -mfpu=neon"
+ fi
+ cat > conftest.$ac_ext <<EOF
+@@ -13407,7 +13407,7 @@ EOF
+ EOF
+ 
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
+       else
+         { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; }
+@@ -13426,7 +13426,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
+ EOF
+ 
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
+       else
+         { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-GNU toolchains" 1>&2; exit 1; }
+diff -r -U 2 -p a/js/src/configure.in b/js/src/configure.in
+--- a/js/src/configure.in	2011-03-31 15:08:36.000000000 -0400
++++ b/js/src/configure.in	2011-10-14 18:37:40.496180956 -0400
+@@ -3551,5 +3551,5 @@ _SAVE_CFLAGS="$CFLAGS"
+ if test "$GNU_CC"; then
+   # gcc needs -mfpu=neon to recognize NEON instructions
+-  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
++  CFLAGS="$CFLAGS -mfpu=neon"
+ fi
+ AC_TRY_COMPILE([],
+@@ -4688,7 +4688,7 @@ if test -n "$MOZ_THUMB2"; then
+         AC_DEFINE(MOZ_THUMB2)
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+@@ -4704,7 +4704,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+
diff --git a/source.local/l/js185/js185.SlackBuild b/source.local/l/js185/js185.SlackBuild
index d362536..d2aa270 100755
--- a/source.local/l/js185/js185.SlackBuild
+++ b/source.local/l/js185/js185.SlackBuild
@@ -79,6 +79,9 @@ cd $TMP
 rm -rf $TARNAME-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $TARNAME-$TARVERS || exit 1
+if [ "$ARCH" = "armv7hl" ]; then
+  patch -p1 --verbose < $CWD/js185-armhf.patch || exit 1
+fi
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source.local/l/keybinder/keybinder.SlackBuild b/source.local/l/keybinder/keybinder.SlackBuild
new file mode 100755
index 0000000..2ef9682
--- /dev/null
+++ b/source.local/l/keybinder/keybinder.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Slackware build script for keybinder
+
+# Copyright 2011  Robby Workman, Northport, Alabama, USA
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=keybinder
+VERSION=${VERSION:-0.3.0}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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 \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-python \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* examples \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/keybinder/slack-desc b/source.local/l/keybinder/slack-desc
new file mode 100644
index 0000000..9eb0802
--- /dev/null
+++ b/source.local/l/keybinder/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------------------------------------------------------|
+keybinder: keybinder (keyboard shortcut library)
+keybinder:
+keybinder: keybinder is a library for registering global keyboard shortcuts. 
+keybinder: Keybinder works with GTK-based applications using the X Window System.
+keybinder:
+keybinder: Homepage: http://kaizer.se/wiki/keybinder/
+keybinder:
+keybinder:
+keybinder:
+keybinder:
+keybinder:
diff --git a/source.local/l/keyutils/keyutils.SlackBuild b/source.local/l/keyutils/keyutils.SlackBuild
new file mode 100755
index 0000000..c7c59f2
--- /dev/null
+++ b/source.local/l/keyutils/keyutils.SlackBuild
@@ -0,0 +1,133 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=keyutils
+VERSION=${VERSION:-1.5.5}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+# Fix the compilation on ARM:
+case "$ARCH" in
+  arm*)  zcat $CWD/keyutils.cflags.patch.gz | patch -p1 --verbose || exit 1
+         ;;
+  *)     ;;
+esac
+
+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 {} \;
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING* LICENSE* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# Relocate man pages:
+mv $PKG/usr/share/man $PKG/usr
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/keyutils/keyutils.cflags.patch.gz b/source.local/l/keyutils/keyutils.cflags.patch.gz
new file mode 100644
index 0000000..2b5f1de
--- /dev/null
+++ b/source.local/l/keyutils/keyutils.cflags.patch.gz
diff --git a/source.local/l/keyutils/slack-desc b/source.local/l/keyutils/slack-desc
new file mode 100644
index 0000000..2091c55
--- /dev/null
+++ b/source.local/l/keyutils/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 ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+keyutils: keyutils (Kernel key management utilities)
+keyutils:
+keyutils: This package contains tools and a wrapper library to control the
+keyutils: Linux kernel key management facility and to provide a mechanism by
+keyutils: which the kernel can call back to user space to get a key
+keyutils: instantiated.
+keyutils:
+keyutils: Homepage:  http://people.redhat.com/~dhowells/keyutils/
+keyutils:
+keyutils:
+keyutils:
diff --git a/source.local/l/lcms/lcms.SlackBuild b/source.local/l/lcms/lcms.SlackBuild
index 86da054..27a5ab8 100755
--- a/source.local/l/lcms/lcms.SlackBuild
+++ b/source.local/l/lcms/lcms.SlackBuild
@@ -24,38 +24,39 @@
 
 
 PKGNAM=lcms
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.19}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/libatasmart/README b/source.local/l/libatasmart/README
new file mode 100644
index 0000000..f926bea
--- /dev/null
+++ b/source.local/l/libatasmart/README
@@ -0,0 +1,2 @@
+libatasmart is a lean, small and clean implementation of an
+ATA S.M.A.R.T. reading and parsing library.
diff --git a/source.local/l/libatasmart/libatasmart.SlackBuild b/source.local/l/libatasmart/libatasmart.SlackBuild
new file mode 100755
index 0000000..0126b88
--- /dev/null
+++ b/source.local/l/libatasmart/libatasmart.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware build script for libatasmart
+
+# Copyright 2010  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.
+
+# Modified 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
+
+PKGNAM=libatasmart
+VERSION=${VERSION:-0.19}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -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 \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --build=$TARGET || exit 1
+
+# Sure, ignore --docdir
+make $NUMJOBS docdir=/usr/doc/$PKGNAM-$VERSION || make  docdir=/usr/doc/$PKGNAM-$VERSION || exit 1
+make install docdir=/usr/doc/$PKGNAM-$VERSION DESTDIR=$PKG || exit 1
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  LGPL README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libatasmart/libatasmart.info b/source.local/l/libatasmart/libatasmart.info
new file mode 100644
index 0000000..39e1f55
--- /dev/null
+++ b/source.local/l/libatasmart/libatasmart.info
@@ -0,0 +1 @@
+http://0pointer.de/public/
diff --git a/source.local/l/libatasmart/slack-desc b/source.local/l/libatasmart/slack-desc
new file mode 100644
index 0000000..44a1609
--- /dev/null
+++ b/source.local/l/libatasmart/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 ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+libatasmart: libatasmart (ATA S.M.A.R.T. library)
+libatasmart:
+libatasmart: libatasmart is a lean, small and clean implementation of an ATA
+libatasmart: S.M.A.R.T. ((Self-Monitoring, Analysis and Reporting Technology)
+libatasmart: reading and parsing library.  S.M.A.R.T. is a system used by hard
+libatasmart: drives to monitor factors that may impact drive reliability in the
+libatasmart: hope of predicting a drive failure before it occurs.
+libatasmart:
+libatasmart: Homepage: http://0pointer.de/blog/projects/being-smart.html
+libatasmart:
+libatasmart:
diff --git a/source.local/l/libbluedevil/libbluedevil.SlackBuild b/source.local/l/libbluedevil/libbluedevil.SlackBuild
new file mode 100755
index 0000000..300adbe
--- /dev/null
+++ b/source.local/l/libbluedevil/libbluedevil.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2011, 2012  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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libbluedevil
+VERSION=${VERSION:-1.9.2}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
+
+# Make sure ownerships and permissions are sane:
+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 {} \;
+
+# Build and install:
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_tests:BOOL=OFF \
+    ..
+  make $NUMJOBS VERBOSE=1 || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd -
+
+# 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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING README* $PKG/usr/doc/$PKGNAM-$VERSION || true
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libbluedevil/slack-desc b/source.local/l/libbluedevil/slack-desc
new file mode 100644
index 0000000..b1aef4b
--- /dev/null
+++ b/source.local/l/libbluedevil/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 ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+libbluedevil: libbluedevil (Qt wrapper for bluez)
+libbluedevil: 
+libbluedevil: This is a Qt-based library for handling Bluetooth functionality.
+libbluedevil:
+libbluedevil: Homepage: http://ereslibre.es/
+libbluedevil:
+libbluedevil:
+libbluedevil:
+libbluedevil:
+libbluedevil:
+libbluedevil:
diff --git a/source.local/l/libcaca/libcaca.SlackBuild b/source.local/l/libcaca/libcaca.SlackBuild
index 313dd31..38979d7 100755
--- a/source.local/l/libcaca/libcaca.SlackBuild
+++ b/source.local/l/libcaca/libcaca.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=libcaca
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.99.beta18}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -92,6 +93,7 @@ CFLAGS="$SLKCFLAGS" \
   --program-prefix= \
   --program-suffix= \
   --disable-imlib2 \
+  --disable-ruby \
   --enable-slang \
   --enable-ncurses \
   --enable-x11 \
diff --git a/source.local/l/libcanberra/libcanberra.SlackBuild b/source.local/l/libcanberra/libcanberra.SlackBuild
new file mode 100755
index 0000000..5d5d299
--- /dev/null
+++ b/source.local/l/libcanberra/libcanberra.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# Slackware build script for libcanberra
+
+# Copyright 2010,2011,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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libcanberra
+VERSION=${VERSION:-0.29}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-oss \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a COPYING* LGPL README* $PKG/usr/doc/$PKGNAM-$VERSION
+( cd $PKG/usr/doc/$PKGNAM-$VERSION ; ln -s ../../share/gtk-doc/html/libcanberra html )
+
+# 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libcanberra/libcanberra.url b/source.local/l/libcanberra/libcanberra.url
new file mode 100644
index 0000000..6dc05d6
--- /dev/null
+++ b/source.local/l/libcanberra/libcanberra.url
@@ -0,0 +1 @@
+http://0pointer.de/lennart/projects/libcanberra/
diff --git a/source.local/l/libcanberra/slack-desc b/source.local/l/libcanberra/slack-desc
new file mode 100644
index 0000000..7c954b7
--- /dev/null
+++ b/source.local/l/libcanberra/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 ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+libcanberra: libcanberra (XDG Sound Theme and Name Spec implementation)
+libcanberra:
+libcanberra: libcanberra is an implementation of the XDG Sound Theme and Name 
+libcanberra: Specifications, for generating event sounds on free desktops. 
+libcanberra: It comes with several backends for several audio systems and is
+libcanberra: designed to be portable.
+libcanberra:
+libcanberra: Homepage: http://0pointer.de/lennart/projects/libcanberra/
+libcanberra:
+libcanberra:
+libcanberra:
diff --git a/source.local/l/libcddb/libcddb.SlackBuild b/source.local/l/libcddb/libcddb.SlackBuild
index 631c198..780cd77 100755
--- a/source.local/l/libcddb/libcddb.SlackBuild
+++ b/source.local/l/libcddb/libcddb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libcddb
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/libcdio/libcdio.SlackBuild b/source.local/l/libcdio/libcdio.SlackBuild
index 8bd0a3c..3cabb85 100755
--- a/source.local/l/libcdio/libcdio.SlackBuild
+++ b/source.local/l/libcdio/libcdio.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,37 +24,38 @@
 
 
 PKGNAM=libcdio
-VERSION=${VERSION:-$(echo $(basename $(echo $PKGNAM-*.tar.bz2 | cut -f 2 -d -) .tar.bz2) | cut -f 2 -d -)}
+VERSION=${VERSION:-0.83}
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+BUILD=${BUILD:-1}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -70,12 +71,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION
 
-# Compile with newer gcc:
-zcat $CWD/libcdio.gcc4.diff.gz | patch -p1 --verbose || exit 1
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -86,6 +84,7 @@ find . \
 
 # Configure:
 CFLAGS="$SLKCFLAGS" \
+LDFLAGS="-ltinfo" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -131,6 +130,14 @@ cp -a \
   AUTHORS COPYING INSTALL MSVC NEWS README README.libcdio THANKS 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
 
diff --git a/source.local/l/libcdio/libcdio.gcc4.diff.gz b/source.local/l/libcdio/libcdio.gcc4.diff.gz
deleted file mode 100644
index bff2bdf..0000000
--- a/source.local/l/libcdio/libcdio.gcc4.diff.gz
+++ /dev/null
diff --git a/source.local/l/libcdio/libcdio.url b/source.local/l/libcdio/libcdio.url
new file mode 100644
index 0000000..e28aefe
--- /dev/null
+++ b/source.local/l/libcdio/libcdio.url
@@ -0,0 +1 @@
+http://ftp.gnu.org/gnu/libcdio/
diff --git a/source.local/l/libcroco/libcroco.SlackBuild b/source.local/l/libcroco/libcroco.SlackBuild
new file mode 100755
index 0000000..c7c7a4f
--- /dev/null
+++ b/source.local/l/libcroco/libcroco.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Slackware build script for libcroco
+
+# 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libcroco
+VERSION=${VERSION:-0.6.5}
+BUILD=${BUILD:-1}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/$PKGNAM-$VERSION \
+  --build=$TARGET
+
+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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING INSTALL NEWS README TODO docs/examples \
+  $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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libcroco/libcroco.url b/source.local/l/libcroco/libcroco.url
new file mode 100644
index 0000000..7c209ee
--- /dev/null
+++ b/source.local/l/libcroco/libcroco.url
@@ -0,0 +1 @@
+http://ftp.gnome.org/pub/gnome/sources/libcroco/
diff --git a/source.local/l/libcroco/slack-desc b/source.local/l/libcroco/slack-desc
new file mode 100644
index 0000000..eabe8cf
--- /dev/null
+++ b/source.local/l/libcroco/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------------------------------------------------------|
+libcroco: libcroco (CSS2 parsing and manipulation library)
+libcroco:
+libcroco: Libcroco is a standalone CSS2 parsing and manipulation library.
+libcroco: The parser provides a low level event driven SAC like API and a CSS
+libcroco: object model like API.
+libcroco:
+libcroco: Libcroco provides a CSS2 selection engine and an experimental
+libcroco: XML/CSS rendering engine.
+libcroco:
+libcroco:
+libcroco:
diff --git a/source.local/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild b/source.local/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
index 1794d15..7dcebcd 100755
--- a/source.local/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
+++ b/source.local/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2010  Eric Hameleers, Eindhoven, The Netherlands
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012, 2013  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,6 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
 
 # Pull this package from git due to some copyright related
 # problems going on at Canonical...
@@ -32,38 +30,39 @@
 # grep dbusmenu_qt_VERSION dbusmenu-qt/CMakeLists.txt
 
 PKGNAM=libdbusmenu-qt
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+VERSION=${VERSION:-0.9.2}
+BUILD=${BUILD:-2}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
@@ -106,6 +105,10 @@ cp -a \
   COPYING NEWS README \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/doc
+mv $PKG/usr/share/doc/dbusmenu-qt/* $PKG/usr/doc/$PKGNAM-$VERSION/doc
+rm -rf $PKG/usr/share/doc
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source.local/l/libdbusmenu-qt/slack-desc b/source.local/l/libdbusmenu-qt/slack-desc
index 0a8aba0..6e72c25 100644
--- a/source.local/l/libdbusmenu-qt/slack-desc
+++ b/source.local/l/libdbusmenu-qt/slack-desc
@@ -12,8 +12,8 @@ libdbusmenu-qt: This library provides a Qt implementation of the DBusMenu protoc
 libdbusmenu-qt: The DBusMenu protocol makes it possible for applications to export
 libdbusmenu-qt: and import their menus over DBus.
 libdbusmenu-qt:
+libdbusmenu-qt: Homepage:  http://people.canonical.com/~agateau/dbusmenu/
 libdbusmenu-qt:
 libdbusmenu-qt:
 libdbusmenu-qt:
-libdbusmenu-qt: Homepage:  http://people.canonical.com/~agateau/dbusmenu/
 libdbusmenu-qt:
diff --git a/source.local/l/libdvdread/libdvdread.SlackBuild b/source.local/l/libdvdread/libdvdread.SlackBuild
index e9229b8..d796d01 100755
--- a/source.local/l/libdvdread/libdvdread.SlackBuild
+++ b/source.local/l/libdvdread/libdvdread.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libdvdread
-VERSION=4.1.3
+VERSION=${VERSION:-4.2.0}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+NUMJOBS=${NUMJOBS:--j7}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/libexif/libexif.SlackBuild b/source.local/l/libexif/libexif.SlackBuild
index 6622d46..5ec62bd 100755
--- a/source.local/l/libexif/libexif.SlackBuild
+++ b/source.local/l/libexif/libexif.SlackBuild
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=libexif
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.6.21}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -101,7 +102,7 @@ strip -g $PKG/usr/lib/*.a
 rm -rf $PKG/usr/share/doc
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* NEWS README* \
+  AUTHORS COPYING* NEWS README* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source.local/l/libgnome-keyring/libgnome-keyring.SlackBuild b/source.local/l/libgnome-keyring/libgnome-keyring.SlackBuild
new file mode 100755
index 0000000..ec78743
--- /dev/null
+++ b/source.local/l/libgnome-keyring/libgnome-keyring.SlackBuild
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Slackware build script for libgnome-keyring
+
+# Copyright 2010-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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libgnome-keyring
+VERSION=${VERSION:-3.6.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/$PKGNAM-$VERSION \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING INSTALL NEWS README* \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libgnome-keyring/slack-desc b/source.local/l/libgnome-keyring/slack-desc
new file mode 100644
index 0000000..1d759e2
--- /dev/null
+++ b/source.local/l/libgnome-keyring/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 ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+libgnome-keyring: libgnome-keyring (gnome-keyring library)
+libgnome-keyring:
+libgnome-keyring: gnome-keyring is a program that keep password and other secrets
+libgnome-keyring: for users.  The library libgnome-keyring is used by applications
+libgnome-keyring: to integrate with the gnome keyring system.
+libgnome-keyring:
+libgnome-keyring:
+libgnome-keyring:
+libgnome-keyring:
+libgnome-keyring:
+libgnome-keyring:
diff --git a/source.local/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff.gz b/source.local/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff.gz
new file mode 100644
index 0000000..eb0968c
--- /dev/null
+++ b/source.local/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff.gz
diff --git a/source.local/l/libgphoto2/libgphoto2.SlackBuild b/source.local/l/libgphoto2/libgphoto2.SlackBuild
index a8dd408..a2f90e0 100755
--- a/source.local/l/libgphoto2/libgphoto2.SlackBuild
+++ b/source.local/l/libgphoto2/libgphoto2.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007-2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,41 +25,39 @@
 
 
 PKGNAM=libgphoto2
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.4.14}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -84,6 +82,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# udev-175 bundles usb_id into the udevd binary
+zcat $CWD/fix-usb_id-callout-for-udev-175.diff.gz | patch -p1 || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -123,8 +124,8 @@ LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX}
 export LD_LIBRARY_PATH CAMLIBS LIBDIR
 # Generate udev rules
 mkdir -p $PKG/lib/udev/rules.d
-$PKG/usr/bin/print-camera-list udev-rules mode 0660 owner root group plugdev \
-  > $PKG/lib/udev/rules.d/90-libgphoto2.rules
+$PKG/usr/bin/print-camera-list udev-rules version 136 mode 0660 owner root group plugdev \
+  > $PKG/lib/udev/rules.d/40-libgphoto2.rules
 # Generate fdi files
 mkdir -p $PKG/usr/share/hal/fdi/information/20thirdparty
 $PKG/usr/bin/print-camera-list hal-fdi \
@@ -133,8 +134,20 @@ $PKG/usr/bin/print-camera-list hal-fdi-device \
   > $PKG/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi
 unset LD_LIBRARY_PATH CAMLIBS LIBDIR   # Unset these just in case
 
-# Compress man pages
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
diff --git a/source.local/l/libgphoto2/slack-desc b/source.local/l/libgphoto2/slack-desc
index 9de29cb..dbc51e5 100644
--- a/source.local/l/libgphoto2/slack-desc
+++ b/source.local/l/libgphoto2/slack-desc
@@ -5,11 +5,11 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-          |-----handy-ruler-------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 libgphoto2: libgphoto2 (Digital Camera Library)
 libgphoto2:
-libgphoto2: libgphoto2 is a library that can be used by
-libgphoto2: applications to access various digital cameras.
+libgphoto2: libgphoto2 is a library that can be used by applications to access
+libgphoto2: various digital cameras.
 libgphoto2:
 libgphoto2: Homepage: http://www.gphoto.org/
 libgphoto2:
diff --git a/source.local/l/libgpod/libgpod.SlackBuild b/source.local/l/libgpod/libgpod.SlackBuild
index e6e1f14..9fc78e0 100755
--- a/source.local/l/libgpod/libgpod.SlackBuild
+++ b/source.local/l/libgpod/libgpod.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libgpod
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.8.2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/libgsf/libgsf.SlackBuild b/source.local/l/libgsf/libgsf.SlackBuild
index ffba67d..f2def33 100755
--- a/source.local/l/libgsf/libgsf.SlackBuild
+++ b/source.local/l/libgsf/libgsf.SlackBuild
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libgsf
-VERSION=${VERSION:-$(echo libgsf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.14.26}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/libical/libical.SlackBuild b/source.local/l/libical/libical.SlackBuild
index 80e4749..c0bd993 100755
--- a/source.local/l/libical/libical.SlackBuild
+++ b/source.local/l/libical/libical.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010a, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 
 PKGNAM=libical
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.48}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -38,33 +38,34 @@ else
   do_java="en"
 fi
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/libical/libical.info b/source.local/l/libical/libical.info
deleted file mode 100644
index 500e53e..0000000
--- a/source.local/l/libical/libical.info
+++ /dev/null
@@ -1,8 +0,0 @@
-PRGNAM="libical"
-VERSION="0.41"
-HOMEPAGE="http://freeassociation.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/freeassociation/libical-0.41.tar.gz"
-MD5SUM="981731f5618c7f1944e0262babdcc910"
-MAINTAINER="ppr:kut"
-EMAIL="pprkut@liwjatan.at"
-APPROVED="dsomero"
diff --git a/source.local/l/libical/slack-desc b/source.local/l/libical/slack-desc
index 6b76012..20ee793 100644
--- a/source.local/l/libical/slack-desc
+++ b/source.local/l/libical/slack-desc
@@ -14,6 +14,6 @@ libical: 2447). It parses iCal components and provides C/C++/Python/Java APIs
 libical: for manipulating the component properties, parameters, and
 libical: subcomponents.
 libical:
-libical: Homepage: http://freeassociation.sourceforge.net/
+libical: Homepage:  http://sourceforge.net/projects/freeassociation/
 libical:
 libical:
diff --git a/source.local/l/libieee1284/libieee1284.SlackBuild b/source.local/l/libieee1284/libieee1284.SlackBuild
index fe6de11..a3b5658 100755
--- a/source.local/l/libieee1284/libieee1284.SlackBuild
+++ b/source.local/l/libieee1284/libieee1284.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libieee1284
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.2.11}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/liblastfm/liblastfm.SlackBuild b/source.local/l/liblastfm/liblastfm.SlackBuild
index 6f3c9eb..5312f9e 100755
--- a/source.local/l/liblastfm/liblastfm.SlackBuild
+++ b/source.local/l/liblastfm/liblastfm.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh 
+#!/bin/sh
 
 # Slackware build script for liblastfm
 
 # Copyright 2009 Vincent Batts
-# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -25,36 +25,41 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-PKGNAM="liblastfm"
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+PKGNAM=liblastfm
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "x86_64" ]; then
+    LIBDIRSUFFIX="64"
+  else
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
+rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
@@ -64,21 +69,16 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix for Ruby 1.9.1:
-sed -i "s/require 'ftools'//g" admin/*
-
-./configure \
-  --prefix /usr \
-  --release
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cmake \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \
+  -DBUILD_FINGERPRINT="ON"
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# For 64-bit, make sure that the libraries are in the proper directory:
-if [ "$LIBDIRSUFFIX" = "64" ]; then
-  mv $PKG/usr/lib $PKG/usr/lib64
-fi
-
 if [ -d $PKG/usr/man ]; then
   gzip -9 $PKG/usr/man/man?/*
 fi
diff --git a/source.local/l/libmsn/libmsn.SlackBuild b/source.local/l/libmsn/libmsn.SlackBuild
index e093903..ea90ca7 100755
--- a/source.local/l/libmsn/libmsn.SlackBuild
+++ b/source.local/l/libmsn/libmsn.SlackBuild
@@ -23,39 +23,46 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=libmsn
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+VERSION=${VERSION:-4.2.1}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j7}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
diff --git a/source.local/l/libmsn/slack-desc b/source.local/l/libmsn/slack-desc
index 8fe1410..b026146 100644
--- a/source.local/l/libmsn/slack-desc
+++ b/source.local/l/libmsn/slack-desc
@@ -11,9 +11,9 @@ libmsn:
 libmsn: Libmsn is a reusable, open-source, fully documented library for
 libmsn: connecting to Microsoft's MSN Messenger service. 
 libmsn:
+libmsn: Homepage:  http://sourceforge.net/projects/libmsn/
 libmsn:
 libmsn:
 libmsn:
 libmsn:
-libmsn: Homepage:  http://sourceforge.net/projects/libmsn/
 libmsn:
diff --git a/source.local/l/libmtp/libmtp.SlackBuild b/source.local/l/libmtp/libmtp.SlackBuild
index ed7d870..079b876 100755
--- a/source.local/l/libmtp/libmtp.SlackBuild
+++ b/source.local/l/libmtp/libmtp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libmtp
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.1.5}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -96,13 +97,13 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Add udev rules:
-mkdir -p $PKG/lib/udev/rules.d
-sed -e 's/MODE="666"/GROUP="audio", MODE="0660"/' libmtp.rules \
-  > $PKG/lib/udev/rules.d/90-libmtp.rules
-# Add device information for HAL:
-mkdir -p $PKG/usr/share/hal/fdi/information/20thirdparty/
-cat libmtp.fdi > $PKG/usr/share/hal/fdi/information/20thirdparty/10-libmtp.fdi
+# Commented out, since the rules are added by the Makefile, and since
+# there's no longer any match for MODE=
+#
+## Add udev rules:
+#mkdir -p $PKG/lib/udev/rules.d
+#sed -e 's/MODE="666"/GROUP="audio", MODE="0660"/' libmtp.rules \
+#  > $PKG/lib/udev/rules.d/90-libmtp.rules
 
 # Guess someone didn't have enough to drink:
 ( cd $PKG/usr/bin
@@ -141,13 +142,18 @@ if [ -d $PKG/usr/info ]; then
   )
 fi
 
-# Why even bother to support --docdir if you can't make it work?
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc/${PKGNAM}-$VERSION $PKG/usr/doc
-rmdir $PKG/usr/share/doc
-
-# We don't need these here
-rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/libmtp.{rules,sh,usermap}
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL 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
diff --git a/source.local/l/libnl3/doinst.sh.gz b/source.local/l/libnl3/doinst.sh.gz
new file mode 100644
index 0000000..7140e2f
--- /dev/null
+++ b/source.local/l/libnl3/doinst.sh.gz
diff --git a/source.local/l/libnl3/libnl3.SlackBuild b/source.local/l/libnl3/libnl3.SlackBuild
new file mode 100755
index 0000000..4f4435f
--- /dev/null
+++ b/source.local/l/libnl3/libnl3.SlackBuild
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+# Slackware build script for libnl3
+
+# 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libnl
+PKGNAME=libnl3
+VERSION=${VERSION:-3.2.11}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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 \
+  --disable-static \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't clobber config files
+mv $PKG/etc/libnl/classid{,.new}
+mv $PKG/etc/libnl/pktloc{,.new}
+
+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
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a COPYING doc/README \
+  $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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAME-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libnl3/slack-desc b/source.local/l/libnl3/slack-desc
new file mode 100644
index 0000000..75af03b
--- /dev/null
+++ b/source.local/l/libnl3/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------------------------------------------------------|
+libnl3: libnl3 (Netlink Protocol Library Suite version 3)
+libnl3:
+libnl3: The libnl suite is a collection of libraries providing APIs to 
+libnl3: netlink protocol based Linux kernel interfaces.
+libnl3: Netlink is a IPC mechanism primarily between the kernel and user 
+libnl3: space processes. It was designed to be a more flexible successor 
+libnl3: to ioctl to provide mainly networking related kernel configuration 
+libnl3: and monitoring interfaces. 
+libnl3:
+libnl3: Homepage: http://www.infradead.org/~tgr/libnl/
+libnl3:
diff --git a/source.local/l/libnotify/libnotify.SlackBuild b/source.local/l/libnotify/libnotify.SlackBuild
index 8a60fac..86654e8 100755
--- a/source.local/l/libnotify/libnotify.SlackBuild
+++ b/source.local/l/libnotify/libnotify.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libnotify
 #
 # Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,40 +23,41 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=libnotify
-VERSION=0.5.2
+VERSION=${VERSION:-0.7.5}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -96,9 +97,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS COPYING README $PKG/usr/doc/$PKGNAM-$VERSION
 ( cd $PKG/usr/doc/$PKGNAM-$VERSION ; ln -s ../../share/gtk-doc/html/libnotify html )
-cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+
+# 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
diff --git a/source.local/l/libpcap/libpcap-1.1.1.tar.gz.sig b/source.local/l/libpcap/libpcap-1.1.1.tar.gz.sig
deleted file mode 100644
index e6da8d8..0000000
--- a/source.local/l/libpcap/libpcap-1.1.1.tar.gz.sig
+++ /dev/null
diff --git a/source.local/l/libpcap/libpcap-1.3.0.tar.gz.sig b/source.local/l/libpcap/libpcap-1.3.0.tar.gz.sig
new file mode 100644
index 0000000..38d3560
--- /dev/null
+++ b/source.local/l/libpcap/libpcap-1.3.0.tar.gz.sig
@@ -0,0 +1,9 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iQCVAwUAT9d3EIqHRg3pndX9AQKoXQP+IT2fkar8CcC+xoWRNEe1p+5jA7HOBGKB
+6e84o9o2xKEjEDt3dhQpeVrkeK1FA+bR53x0379GMq0Vym/GQiJJYEiNW5tFyid8
+YnlA7p7heXx4IEfjglmh10hwWffOUdpVQ67p0bd0CQweUc71loVVePmJvEJcLaUQ
+gfPGtL+M+ro=
+=dJIZ
+-----END PGP SIGNATURE-----
diff --git a/source.local/l/libpcap/libpcap.SlackBuild b/source.local/l/libpcap/libpcap.SlackBuild
index 5069b2c..68fe8d0 100755
--- a/source.local/l/libpcap/libpcap.SlackBuild
+++ b/source.local/l/libpcap/libpcap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,27 +24,30 @@
 
 
 PKGNAM=libpcap
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  LIBDIRSUFFIX=""
+  # 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" = "x86_64" ]; then
+    LIBDIRSUFFIX="64"
+  else
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -89,13 +92,6 @@ make install DESTDIR=$PKG || exit 1
 
 strip --strip-debug libpcap.so.1.?.?
 
-cp libpcap.so.?.?.? $PKG/usr/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf libpcap.so.1.?.? libpcap.so.1
-  ln -sf libpcap.so.1 libpcap.so.0
-  ln -sf libpcap.so.1 libpcap.so
-)
-
 mkdir -p $PKG/usr/doc/libpcap-$VERSION
 cp -a \
   CHANGES CREDITS INSTALL.txt LICENSE README* TODO VERSION \
@@ -115,6 +111,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
   ln -sf pcap_next_ex.3pcap pcap_next.3pcap
   ln -sf pcap_open_offline.3pcap pcap_fopen_offline.3pcap
   ln -sf pcap_setnonblock.3pcap pcap_getnonblock.3pcap
+  ln -sf pcap_findalldevs.3pcap pcap_freealldevs.3pcap
+  ln -sf pcap_free_tstamp_types.3pcap pcap_list_tstamp_types.3pcap
+  ln -sf pcap_free_datalinks.3pcap pcap_list_datalinks.3pcap
 )
 
 # Compress and if needed symlink the man pages:
diff --git a/source.local/l/libplist/libplist.SlackBuild b/source.local/l/libplist/libplist.SlackBuild
index 9a1ace9..46bab91 100755
--- a/source.local/l/libplist/libplist.SlackBuild
+++ b/source.local/l/libplist/libplist.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libplist
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.8}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
@@ -87,7 +88,8 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     ..
-   make $NUMJOBS || make || exit 1
+   # Parallel build is broken:
+   make || exit 1
    make install DESTDIR=$PKG || exit 1
 cd -
 
diff --git a/source.local/l/librsvg/librsvg.SlackBuild b/source.local/l/librsvg/librsvg.SlackBuild
index 9a638e4..c4505a8 100755
--- a/source.local/l/librsvg/librsvg.SlackBuild
+++ b/source.local/l/librsvg/librsvg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=librsvg
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.36.4}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -89,9 +90,7 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var/lib \
   --mandir=/usr/man \
   --enable-static=no \
-  --with-svgz \
   --build=$TARGET
-#  --with-croco \
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -99,8 +98,20 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
diff --git a/source.local/l/libsecret/libsecret.SlackBuild b/source.local/l/libsecret/libsecret.SlackBuild
new file mode 100755
index 0000000..5e1ce91
--- /dev/null
+++ b/source.local/l/libsecret/libsecret.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Slackware build script for libsecret
+
+# 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libsecret
+VERSION=${VERSION:-0.12}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/$PKGNAM-$VERSION \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libsecret/slack-desc b/source.local/l/libsecret/slack-desc
new file mode 100644
index 0000000..c18a911
--- /dev/null
+++ b/source.local/l/libsecret/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 ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+libsecret: libsecret (library to access the Secret Service API)
+libsecret:
+libsecret: libsecret is a GObject based library for accessing the 
+libsecret: Secret Service API.
+libsecret:
+libsecret:
+libsecret:
+libsecret:
+libsecret:
+libsecret:
+libsecret:
diff --git a/source.local/l/libsoup/libsoup.SlackBuild b/source.local/l/libsoup/libsoup.SlackBuild
new file mode 100755
index 0000000..eccab17
--- /dev/null
+++ b/source.local/l/libsoup/libsoup.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/sh
+#
+# Slackware build script for libsoup
+#
+# Copyright 2009-2010  Erik W. Hanson, Minneapolis, 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libsoup
+VERSION=${VERSION:-2.40.3}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var/lib \
+  --disable-static \
+  --with-gnome \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install-strip DESTDIR=$PKG || exit 1
+
+## NOTE:  These _should_ go eventually, but for now it causes problems.
+## Don't ship .la files:
+#rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a COPYING* AUTHORS NEWS README* $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libsoup/slack-desc b/source.local/l/libsoup/slack-desc
new file mode 100644
index 0000000..80cd6ef
--- /dev/null
+++ b/source.local/l/libsoup/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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+libsoup: libsoup (an HTTP client/server library)
+libsoup:
+libsoup: Soup is an HTTP client/server library implementation in C.  It uses
+libsoup: GObjects and the glib main loop to integrate well with GTK+
+libsoup: applications, and has a synchronous API suitable for use in threaded
+libsoup: applications.
+libsoup:
+libsoup:
+libsoup:
+libsoup:
+libsoup:
diff --git a/source.local/l/libspectre/libspectre.SlackBuild b/source.local/l/libspectre/libspectre.SlackBuild
index 240dcc9..3914187 100755
--- a/source.local/l/libspectre/libspectre.SlackBuild
+++ b/source.local/l/libspectre/libspectre.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,39 +23,40 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-PRGNAM=libspectre
-VERSION=${VERSION:-0.2.5}
+PKGNAM=libspectre
+VERSION=${VERSION:-0.2.7}
 BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -65,14 +66,14 @@ esac
 
 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 \) \
@@ -113,14 +114,14 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* INSTALL NEWS README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$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
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source.local/l/libssh/libssh-0.5.3.tar.asc b/source.local/l/libssh/libssh-0.5.3.tar.asc
deleted file mode 100644
index a6ed34a..0000000
--- a/source.local/l/libssh/libssh-0.5.3.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEABECAAYFAlCrbO0ACgkQf94+j/M+P8aS6gCfVYbytLhjWaiDn4k5l0wG0W4h
-ZU8An03ouV2szjPyzQt+rbnEfSF4gP+F
-=R4vY
------END PGP SIGNATURE-----
diff --git a/source.local/l/libssh/libssh-0.5.4.tar.asc b/source.local/l/libssh/libssh-0.5.4.tar.asc
new file mode 100644
index 0000000..45d97f9
--- /dev/null
+++ b/source.local/l/libssh/libssh-0.5.4.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEABECAAYFAlD+b5MACgkQf94+j/M+P8ZPegCcDYgwXjjfdK/kKJ5eFzNodeqP
+e3oAn3tCy6hVfqnVI0WMnKzD3s6D4qdQ
+=oFdJ
+-----END PGP SIGNATURE-----
diff --git a/source.local/l/libssh/libssh.SlackBuild b/source.local/l/libssh/libssh.SlackBuild
index 92c8df7..23ddca7 100755
--- a/source.local/l/libssh/libssh.SlackBuild
+++ b/source.local/l/libssh/libssh.SlackBuild
@@ -25,7 +25,7 @@
 
 
 PKGNAM=libssh
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.5.4}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -71,6 +71,9 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
+# These fail to build and are not packaged anyway:
+zcat $CWD/libssh.no.example.build.diff.gz | patch -p1 --verbose || exit 1
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
diff --git a/source.local/l/libssh/libssh.no.example.build.diff.gz b/source.local/l/libssh/libssh.no.example.build.diff.gz
new file mode 100644
index 0000000..c1ef0eb
--- /dev/null
+++ b/source.local/l/libssh/libssh.no.example.build.diff.gz
diff --git a/source.local/l/libtasn1/libtasn1.SlackBuild b/source.local/l/libtasn1/libtasn1.SlackBuild
new file mode 100755
index 0000000..7dd0109
--- /dev/null
+++ b/source.local/l/libtasn1/libtasn1.SlackBuild
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# Slackware build script for libtasn1
+
+# Copyright 2010-2012  Robby Workman, Northport, Alabama, USA
+#
+# 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libtasn1
+VERSION=${VERSION:-2.12}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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 \
+  --infodir=/usr/info \
+  --enable-shared \
+  --disable-static \
+  --build=$TARGET || exit 1
+  #--disable-gtk-doc \
+  
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* NEWS README* THANKS \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libtasn1/slack-desc b/source.local/l/libtasn1/slack-desc
new file mode 100644
index 0000000..da00dac
--- /dev/null
+++ b/source.local/l/libtasn1/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 ':'.
+
+        |-----handy-ruler-----------------------------------------------------|
+libtasn1: libtasn1 (ASN.1 library)
+libtasn1:
+libtasn1: Libtasn1 is the GNU ASN.1 library.  Abstract Syntax Notation One
+libtasn1: (ASN.1) is a standard and flexible notation that describes rules and
+libtasn1: structures for representing, encoding, transmitting, and decoding
+libtasn1: data in telecommunications and computer networking.
+libtasn1:
+libtasn1: Libtasn1 was written by Fabio Fiorina.
+libtasn1:
+libtasn1:
+libtasn1:
diff --git a/source.local/l/libtiff/libtiff.SlackBuild b/source.local/l/libtiff/libtiff.SlackBuild
index a781711..a52805f 100755
--- a/source.local/l/libtiff/libtiff.SlackBuild
+++ b/source.local/l/libtiff/libtiff.SlackBuild
@@ -23,41 +23,41 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo tiff-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+PKGNAM=libtiff
+SRCNAM=tiff
+VERSION=${VERSION:-3.9.6}
 BUILD=1
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-  LIBDIRSUFFIX=""
-elif [ "$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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -67,14 +67,14 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-libtiff
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $PKG
 cd $TMP
-rm -rf tiff-$VERSION
-tar xvf $CWD/tiff-$VERSION.tar.?z* || exit 1
-cd tiff-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION
 
 zcat $CWD/libtiff-CVE-2012-1173.patch.gz | patch -p1 --verbose || exit 1
 
@@ -90,8 +90,8 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --program-prefix="" \
-  --program-suffix="" \
+  --program-prefix= \
+  --program-suffix= \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
@@ -104,10 +104,10 @@ rm -r $PKG/usr/share
 )
 strip -g $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a
 chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/libtiff*.so.*
-mkdir -p $PKG/usr/doc/libtiff-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   COPYRIGHT README RELEASE-DATE TODO VERSION \
-  $PKG/usr/doc/libtiff-$VERSION
+  $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:
@@ -128,5 +128,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/libtiff-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source.local/l/libvisual-plugins/libvisual-plugins.SlackBuild b/source.local/l/libvisual-plugins/libvisual-plugins.SlackBuild
index d675830..6ca264f 100755
--- a/source.local/l/libvisual-plugins/libvisual-plugins.SlackBuild
+++ b/source.local/l/libvisual-plugins/libvisual-plugins.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libvisual-plugins
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.4.0}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/libvisual/libvisual.SlackBuild b/source.local/l/libvisual/libvisual.SlackBuild
index e9b41b6..acce4b3 100755
--- a/source.local/l/libvisual/libvisual.SlackBuild
+++ b/source.local/l/libvisual/libvisual.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libvisual
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.4.0}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -74,6 +75,8 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
+zcat $CWD/libvisual.glib.h.diff.gz | patch -p1 --verbose || exit 1
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
diff --git a/source.local/l/libvisual/libvisual.glib.h.diff.gz b/source.local/l/libvisual/libvisual.glib.h.diff.gz
new file mode 100644
index 0000000..d23651c
--- /dev/null
+++ b/source.local/l/libvisual/libvisual.glib.h.diff.gz
diff --git a/source.local/l/libvncserver/libvncserver.SlackBuild b/source.local/l/libvncserver/libvncserver.SlackBuild
new file mode 100755
index 0000000..e3221ab
--- /dev/null
+++ b/source.local/l/libvncserver/libvncserver.SlackBuild
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
+# 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
+# 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.
+
+# Modified by Robby Workman <rworkman at slackware.com>
+# Modified by Eric Hameleers <alien at slackware.com>
+
+
+VERSION=${VERSION:-0.9.9}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-libvncserver
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf LibVNCServer-$VERSION
+tar xvf $CWD/LibVNCServer-$VERSION.tar.?z* || exit 1
+cd LibVNCServer-$VERSION || 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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$TARGET
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+if [ -x client_examples/.libs/SDLvncviewer ]; then
+  cp -a client_examples/.libs/SDLvncviewer $PKG/usr/bin/SDLvncviewer
+fi
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/libvncserver-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README TODO \
+  $PKG/usr/doc/libvncserver-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/libvncserver-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libvncserver/libvncserver.info b/source.local/l/libvncserver/libvncserver.info
new file mode 100644
index 0000000..11fc89f
--- /dev/null
+++ b/source.local/l/libvncserver/libvncserver.info
@@ -0,0 +1,5 @@
+PRGNAM="libvncserver"
+VERSION="0.9.1"
+HOMEPAGE="http://libvncserver.sourceforge.net/"
+DOWNLOAD="http://downloads.sourceforge.net/libvncserver/LibVNCServer-0.9.1.tar.gz"
+MD5SUM="aa00efc3dabde82fde9509bfbab0aba4"
diff --git a/source.local/l/libvncserver/slack-desc b/source.local/l/libvncserver/slack-desc
new file mode 100644
index 0000000..d3924fc
--- /dev/null
+++ b/source.local/l/libvncserver/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 ':'.
+
+            |-----handy-ruler-----------------------------------------------|
+libvncserver: libvncserver (VNC Server Library)
+libvncserver:
+libvncserver: LibVNCServer makes writing a VNC server (or more correctly,
+libvncserver: a program exporting a framebuffer via the Remote Frame Buffer
+libvncserver: protocol) easy.
+libvncserver:
+libvncserver: Homepage:  http://libvncserver.sourceforge.net/
+libvncserver:
+libvncserver:
+libvncserver:
+libvncserver:
diff --git a/source.local/l/libwnck/libwnck.SlackBuild b/source.local/l/libwnck/libwnck.SlackBuild
index f3a0950..b83fd28 100755
--- a/source.local/l/libwnck/libwnck.SlackBuild
+++ b/source.local/l/libwnck/libwnck.SlackBuild
@@ -24,38 +24,39 @@
 
 
 PKGNAM=libwnck
-VERSION=${VERSION:-$(echo libwnck-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.30.7}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -65,14 +66,14 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-libwnck
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf libwnck-$VERSION
-tar xvf $CWD/libwnck-$VERSION.tar.?z* || exit 1
-cd libwnck-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -95,10 +96,10 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/libwnck-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* NEWS README* \
-  $PKG/usr/doc/libwnck-$VERSION
+  $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:
@@ -127,5 +128,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/libwnck-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source.local/l/libwpd/libwpd.SlackBuild b/source.local/l/libwpd/libwpd.SlackBuild
index c105e50..7ad7bf6 100755
--- a/source.local/l/libwpd/libwpd.SlackBuild
+++ b/source.local/l/libwpd/libwpd.SlackBuild
@@ -23,38 +23,40 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=0.8.14
+PKGNAM=libwpd
+VERSION=${VERSION:-0.9.6}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -64,14 +66,14 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-libwpd
+PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf libwpd-$VERSION
-tar xvf $CWD/libwpd-$VERSION.tar.bz2 || exit 1
-cd libwpd-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -84,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --without-docs \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
@@ -92,18 +95,17 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/libwpd-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   CHANGES COPYING CREDITS HACKING INSTALL README TODO \
-  $PKG/usr/doc/libwpd-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
-# Developers may find these docs in the source interesting, but most users won't:
-rm -rf $PKG/usr/share/doc
-rmdir $PKG/usr/share
+# Remove empty folder:
+rm -rf $PKG/usr/share
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/libwpd-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source.local/l/libxklavier/libxklavier.SlackBuild b/source.local/l/libxklavier/libxklavier.SlackBuild
index 452cfb0..72cb55c 100755
--- a/source.local/l/libxklavier/libxklavier.SlackBuild
+++ b/source.local/l/libxklavier/libxklavier.SlackBuild
@@ -25,38 +25,40 @@
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo libxklavier-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+PKGNAM=libxklavier
+VERSION=${VERSION:-5.3}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -66,14 +68,14 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-libxklavier
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf libxklavier-$VERSION
-tar xvf $CWD/libxklavier-$VERSION.tar.?z* || exit 1
-cd libxklavier-$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 \) \
@@ -98,11 +100,11 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/libxklavier-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* CREDITS INSTALL NEWS README* \
-  $PKG/usr/doc/libxklavier-$VERSION
-( cd $PKG/usr/doc/libxklavier-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
+( cd $PKG/usr/doc/$PKGNAM-$VERSION
   ln -s /usr/share/gtk-doc/html/libxklavier html
 )
 
@@ -118,5 +120,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/libxklavier-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source.local/l/libyaml/libyaml.SlackBuild b/source.local/l/libyaml/libyaml.SlackBuild
new file mode 100755
index 0000000..95aafe7
--- /dev/null
+++ b/source.local/l/libyaml/libyaml.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Copyright 2011  Vincent Batts, Vienna, VA, 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=libyaml
+SRCNAM=yaml
+VERSION=${VERSION:-0.1.4}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$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/$PKGNAM-$VERSION \
+  --disable-static \
+  --build=$TARGET
+
+make $NUMJOBS || 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/$PKGNAM-$VERSION
+cp -a \
+  README LICENSE doc \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+#cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/libyaml/libyaml.url b/source.local/l/libyaml/libyaml.url
new file mode 100644
index 0000000..0ee34d3
--- /dev/null
+++ b/source.local/l/libyaml/libyaml.url
@@ -0,0 +1 @@
+http://pyyaml.org/wiki/LibYAML
diff --git a/source.local/l/libyaml/slack-desc b/source.local/l/libyaml/slack-desc
new file mode 100644
index 0000000..8965634
--- /dev/null
+++ b/source.local/l/libyaml/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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+libyaml: libyaml (YAML parser, written in C)
+libyaml:
+libyaml: YAML Ain't Markup Language. It is a human friendly data serialization 
+libyaml: standard for all programming languages.
+libyaml:
+libyaml: Homepage: http://pyyaml.org/wiki/LibYAML
+libyaml:
+libyaml:
+libyaml:
+libyaml:
+libyaml:
diff --git a/source.local/l/loudmouth/loudmouth.SlackBuild b/source.local/l/loudmouth/loudmouth.SlackBuild
index f1bed54..e38e922 100755
--- a/source.local/l/loudmouth/loudmouth.SlackBuild
+++ b/source.local/l/loudmouth/loudmouth.SlackBuild
@@ -1,5 +1,6 @@
 #!/bin/sh
 # Copyright 2009 Eric Hameleers, Eindhoven, NL
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -25,43 +26,39 @@
 
 
 PKGNAM=loudmouth
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.5.0-20121201}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:" -j4 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  SLKLDFLAGS="-L/usr/lib64"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -80,14 +77,7 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-zcat $CWD/loudmouth.crtpath.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/loudmouth.gnutls.configure.ac.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/loudmouth.async_assertion.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/loudmouth.sasl-md5-digest-uri.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/loudmouth.stanzadrop.diff.gz | patch -p1 --verbose || exit 1
-
-# needed after the configure.ac gnutls patch
-autoreconf
+zcat $CWD/loudmouth.ld.gobject.diff.gz | patch -p1 --verbose || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -108,15 +98,21 @@ LDFLAGS="$SLKLDFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --with-ssl=gnutls \
-  --enable-debug=no \
+  --enable-debug=yes \
   --enable-static=no \
+  --enable-gtk-doc \
   --program-prefix= \
   --program-suffix= \
   --build=$TARGET \
   --host=$TARGET
 
-# this generates a broken libtool, so use the system version:
-cp /usr/bin/libtool .
+##
+## NOTE: For some reason --enable-debug=yes actually _disables_ verbose debug
+## messages to the console.  Don't mess with it!
+##
+
+## this generates a broken libtool, so use the system version:
+#cp /usr/bin/libtool .
 
 # Build and install:
 make $NUMJOBS || make || exit 1
@@ -149,5 +145,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
 
diff --git a/source.local/l/loudmouth/loudmouth.async_assertion.diff.gz b/source.local/l/loudmouth/loudmouth.async_assertion.diff.gz
deleted file mode 100644
index 7807529..0000000
--- a/source.local/l/loudmouth/loudmouth.async_assertion.diff.gz
+++ /dev/null
diff --git a/source.local/l/loudmouth/loudmouth.crtpath.diff.gz b/source.local/l/loudmouth/loudmouth.crtpath.diff.gz
deleted file mode 100644
index 798f30e..0000000
--- a/source.local/l/loudmouth/loudmouth.crtpath.diff.gz
+++ /dev/null
diff --git a/source.local/l/loudmouth/loudmouth.gnutls.configure.ac.diff.gz b/source.local/l/loudmouth/loudmouth.gnutls.configure.ac.diff.gz
deleted file mode 100644
index 340c365..0000000
--- a/source.local/l/loudmouth/loudmouth.gnutls.configure.ac.diff.gz
+++ /dev/null
diff --git a/source.local/l/loudmouth/loudmouth.ld.gobject.diff.gz b/source.local/l/loudmouth/loudmouth.ld.gobject.diff.gz
new file mode 100644
index 0000000..ea09e3a
--- /dev/null
+++ b/source.local/l/loudmouth/loudmouth.ld.gobject.diff.gz
diff --git a/source.local/l/loudmouth/loudmouth.sasl-md5-digest-uri.diff.gz b/source.local/l/loudmouth/loudmouth.sasl-md5-digest-uri.diff.gz
deleted file mode 100644
index 0a6e502..0000000
--- a/source.local/l/loudmouth/loudmouth.sasl-md5-digest-uri.diff.gz
+++ /dev/null
diff --git a/source.local/l/loudmouth/loudmouth.stanzadrop.diff.gz b/source.local/l/loudmouth/loudmouth.stanzadrop.diff.gz
deleted file mode 100644
index beab9c9..0000000
--- a/source.local/l/loudmouth/loudmouth.stanzadrop.diff.gz
+++ /dev/null
diff --git a/source.local/l/media-player-info/media-player-info.SlackBuild b/source.local/l/media-player-info/media-player-info.SlackBuild
new file mode 100755
index 0000000..8f606e0
--- /dev/null
+++ b/source.local/l/media-player-info/media-player-info.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Slackware build script for media-player-info
+
+# Copyright 2010-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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=media-player-info
+VERSION=${VERSION:-17}
+BUILD=${BUILD:-1}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz
+
diff --git a/source.local/l/media-player-info/slack-desc b/source.local/l/media-player-info/slack-desc
new file mode 100644
index 0000000..509b51b
--- /dev/null
+++ b/source.local/l/media-player-info/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 ':'.
+
+                 |-----handy-ruler------------------------------------------------------|
+media-player-info: media-player-info (media player capability data)
+media-player-info:
+media-player-info: media-player-info is a repository of data files describing media 
+media-player-info: player (mostly USB Mass Storage ones) capabilities.  These files 
+media-player-info: contain information about the directory layout to use to add music 
+media-player-info: to these devices, about the supported file formats,
+media-player-info:
+media-player-info:
+media-player-info:
+media-player-info:
+media-player-info:
diff --git a/source.local/l/neon/neon.SlackBuild b/source.local/l/neon/neon.SlackBuild
index cb0306a..44e12bc 100755
--- a/source.local/l/neon/neon.SlackBuild
+++ b/source.local/l/neon/neon.SlackBuild
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=neon
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.29.6}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/notify-python/libnotify07.patch.gz b/source.local/l/notify-python/libnotify07.patch.gz
new file mode 100644
index 0000000..7cf230f
--- /dev/null
+++ b/source.local/l/notify-python/libnotify07.patch.gz
diff --git a/source.local/l/notify-python/notify-python.SlackBuild b/source.local/l/notify-python/notify-python.SlackBuild
index 55a4a08..5d8577b 100755
--- a/source.local/l/notify-python/notify-python.SlackBuild
+++ b/source.local/l/notify-python/notify-python.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for notify-python
 
 # Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,40 +23,41 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=notify-python
-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:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-3}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -80,6 +81,9 @@ chmod -R u+w,go+r-w,a-s .
 # Fix http://trac.galago-project.org/ticket/121
 rm -f src/pynotify.c
 
+# Fix build with libnotify-0.7 (thanks, Fedora)
+zcat $CWD/libnotify07.patch.gz | patch -p1 || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -94,7 +98,7 @@ make install-strip DESTDIR=$PKG || exit 1
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING INSTALL NEWS README \
-    $PKG/usr/doc/$PKGNAM-$VERSION
+  $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:
diff --git a/source.local/l/notify-python/slack-desc b/source.local/l/notify-python/slack-desc
index 3d52503..e7718b4 100644
--- a/source.local/l/notify-python/slack-desc
+++ b/source.local/l/notify-python/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-             |-----handy-ruler-------------------------------------------------------|
+             |-----handy-ruler------------------------------------------------------|
 notify-python: notify-python (Python bindings for libnotify)
 notify-python:
 notify-python: The notify-python package contains bindings to use libnotify with
diff --git a/source.local/l/pango/pango.SlackBuild b/source.local/l/pango/pango.SlackBuild
index 14de3fc..f6534ca 100755
--- a/source.local/l/pango/pango.SlackBuild
+++ b/source.local/l/pango/pango.SlackBuild
@@ -20,40 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=pango
-VERSION=${VERSION:-$(echo pango-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.30.1}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -61,8 +64,6 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-pango
@@ -147,8 +148,20 @@ EOF
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/pango-$VERSION
 cp -a \
diff --git a/source.local/l/pango/update-pango-querymodules b/source.local/l/pango/update-pango-querymodules
index c330d6b..59c747b 100644
--- a/source.local/l/pango/update-pango-querymodules
+++ b/source.local/l/pango/update-pango-querymodules
@@ -8,8 +8,10 @@ host=$(uname -m)-slackware-linux
 
 # Fix $host for arm arch:
 case "$host" in
-  armv7hl*) host=armv7hl-slackware-linux-gnueabi ;;
-  arm*)     host=arm-slackware-linux-gnueabi ;;
+  armv7l*) hostqq=armv7l-slackware-linux-gnueabi
+           readelf /usr/bin/file -A | grep -q "Tag_FP_arch" && host=armv7hl-slackware-linux-gnueabi
+           ;;
+  arm*)    host=arm-slackware-linux-gnueabi ;;
 esac
  
 # Deriving /etc/pango/$host location
diff --git a/source.local/l/phonon-gstreamer/phonon-gstreamer.SlackBuild b/source.local/l/phonon-gstreamer/phonon-gstreamer.SlackBuild
new file mode 100755
index 0000000..7303133
--- /dev/null
+++ b/source.local/l/phonon-gstreamer/phonon-gstreamer.SlackBuild
@@ -0,0 +1,123 @@
+#!/bin/sh
+# Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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=phonon-gstreamer
+SRCNAM=phonon-backend-gstreamer
+VERSION=${VERSION:-4.6.3}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION || 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 {} \;
+
+echo Building ...
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+  make $NUMJOBS
+  make DESTDIR=$PKG install
+cd -
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING.LIB gstreamer/lgpl-* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# Compress the man page(s):
+if [ -d $PKG/usr/man ]; then
+  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).
+gz $i.gz ; rm $i ; done
+fi
+
+# Strip binaries (if any):
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Add a package description:
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/phonon-gstreamer/slack-desc b/source.local/l/phonon-gstreamer/slack-desc
new file mode 100644
index 0000000..ee2a434
--- /dev/null
+++ b/source.local/l/phonon-gstreamer/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 ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+phonon-gstreamer: phonon-gstreamer (gstreamer backend for phonon)
+phonon-gstreamer:
+phonon-gstreamer: This package provides an additional gstreamer backend for the phonon
+phonon-gstreamer: multimedia framework used in KDE.
+phonon-gstreamer:
+phonon-gstreamer: For more information, visit:
+phonon-gstreamer: https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer
+phonon-gstreamer:
+phonon-gstreamer:
+phonon-gstreamer:
+phonon-gstreamer:
diff --git a/source.local/l/phonon-mplayer/machine.conf b/source.local/l/phonon-mplayer/machine.conf
new file mode 100644
index 0000000..c8afb4b
--- /dev/null
+++ b/source.local/l/phonon-mplayer/machine.conf
@@ -0,0 +1,5 @@
+if [ "$ARCH ="armv7hl" ]; then
+  export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fPIC"
+  export LIBDIRSUFFIX=""
+fi
+
diff --git a/source.local/l/phonon-mplayer/phonon-mplayer.SlackBuild b/source.local/l/phonon-mplayer/phonon-mplayer.SlackBuild
index 78660e3..6d15159 100755
--- a/source.local/l/phonon-mplayer/phonon-mplayer.SlackBuild
+++ b/source.local/l/phonon-mplayer/phonon-mplayer.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright 2010  Eric Hameleers, Eindhoven, NL
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -22,41 +22,41 @@
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
 
 PKGNAM=phonon-mplayer
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
+VERSION=${VERSION:-1b1fd1f_20110823git}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+NUMJOBS=${NUMJOBS:" -j7 "}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fPIC"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
diff --git a/source.local/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch b/source.local/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch
new file mode 100644
index 0000000..0ce1023
--- /dev/null
+++ b/source.local/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch
@@ -0,0 +1,186 @@
+From: Andras Mantia <amantia@kde.org>
+Date: Thu, 10 Nov 2011 08:43:52 +0000
+Subject: Use the global FindPhonon.cmake that really finds Phonon.
+X-Git-Url: http://quickgit.kde.org/?p=phonon-xine.git&amp;a=commitdiff&amp;h=8c7fab4e433b53ac2f00093f1f464e0178c2d3e1
+---
+Use the global FindPhonon.cmake that really finds Phonon.
+---
+
+
+--- a/cmake/FindPhonon.cmake
++++ /dev/null
+@@ -1,53 +0,0 @@
+-# Find Phonon
+-
+-# Copyright (c) 2010, Harald Sitter <sitter@kde.org>
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if (NOT PHONON_BUILDSYSTEM_DIR)
+-    find_program(PC_EXECUTABLE NAMES pkg-config
+-    PATH_SUFFIXES bin               
+-    HINTS
+-    ${CMAKE_INSTALL_PREFIX}
+-    ONLY_CMAKE_FIND_ROOT_PATH
+-    )
+-
+-    if (NOT PC_EXECUTABLE)
+-        if (Phonon_FIND_REQUIRED)
+-            message(FATAL_ERROR "ERROR: Could not find pkg-config [required to find Phonon].")
+-        endif (Phonon_FIND_REQUIRED)
+-    endif (NOT PC_EXECUTABLE)
+-
+-    if (PC_EXECUTABLE)
+-        execute_process(COMMAND "${PC_EXECUTABLE}" --variable=buildsystemdir phonon
+-                        OUTPUT_VARIABLE _data_DIR
+-                        ERROR_QUIET
+-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+-        file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
+-        find_path(PHONON_BUILDSYSTEM_DIR FindPhononInternal.cmake HINTS ${_data_DIR})
+-    endif (PC_EXECUTABLE)
+-endif (NOT PHONON_BUILDSYSTEM_DIR)
+-
+-if (PHONON_BUILDSYSTEM_DIR)
+-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR})
+-
+-    if (Phonon_FIND_REQUIRED)
+-        set(_req REQUIRED)
+-    endif (Phonon_FIND_REQUIRED)
+-    if (PHONON_FIND_QUIETLY)
+-        set(_quiet QUIET)
+-    endif (PHONON_FIND_QUIETLY)
+-
+-    find_package(PhononInternal ${_req} ${_quiet})
+-else (PHONON_BUILDSYSTEM_DIR)
+-    if (_data_DIR)
+-        if (Phonon_FIND_REQUIRED)
+-            message(FATAL_ERROR "ERROR: FindPhonon.cmake not found in ${_data_DIR}")
+-        endif (Phonon_FIND_REQUIRED)
+-    else (_data_DIR)
+-        if (Phonon_FIND_REQUIRED)
+-            message(FATAL_ERROR "ERROR: Either pkg-config can not find its phonon config, or you are not using a recent enough Phonon version.")
+-        endif (Phonon_FIND_REQUIRED)
+-    endif (_data_DIR)
+-endif (PHONON_BUILDSYSTEM_DIR)
+
+--- /dev/null
++++ b/cmake/MacroEnsureVersion.cmake
+@@ -0,0 +1,117 @@
++# This file defines the following macros for developers to use in ensuring
++# that installed software is of the right version:
++#
++# MACRO_ENSURE_VERSION        - test that a version number is greater than
++#                               or equal to some minimum
++# MACRO_ENSURE_VERSION_RANGE - test that a version number is greater than
++#                               or equal to some minimum and less than some
++#                               maximum
++# MACRO_ENSURE_VERSION2       - deprecated, do not use in new code
++#
++
++# MACRO_ENSURE_VERSION
++# This macro compares version numbers of the form "x.y.z" or "x.y"
++# MACRO_ENSURE_VERSION( FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK)
++# will set FOO_VERSION_OK to true if FOO_VERSION_FOUND >= FOO_MIN_VERSION
++# Leading and trailing text is ok, e.g.
++# MACRO_ENSURE_VERSION( "2.5.31" "flex 2.5.4a" VERSION_OK)
++# which means 2.5.31 is required and "flex 2.5.4a" is what was found on the system
++
++# Copyright (c) 2006, David Faure, <faure@kde.org>
++# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++# MACRO_ENSURE_VERSION_RANGE
++# This macro ensures that a version number of the form
++# "x.y.z" or "x.y" falls within a range defined by
++# min_version <= found_version < max_version.
++# If this expression holds, FOO_VERSION_OK will be set TRUE
++#
++# Example: MACRO_ENSURE_VERSION_RANGE3( "0.1.0" ${FOOCODE_VERSION} "0.7.0" FOO_VERSION_OK )
++#
++# This macro will break silently if any of x,y,z are greater than 100.
++#
++# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++# NORMALIZE_VERSION
++# Helper macro to convert version numbers of the form "x.y.z"
++# to an integer equal to 10^4 * x + 10^2 * y + z
++#
++# This macro will break silently if any of x,y,z are greater than 100.
++#
++# Copyright (c) 2006, David Faure, <faure@kde.org>
++# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++# CHECK_RANGE_INCLUSIVE_LOWER
++# Helper macro to check whether x <= y < z
++#
++# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++
++MACRO(NORMALIZE_VERSION _requested_version _normalized_version)
++    STRING(REGEX MATCH "[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" _threePartMatch "${_requested_version}")
++    if (_threePartMatch)
++    # parse the parts of the version string
++        STRING(REGEX REPLACE "[^0-9]*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major_vers "${_requested_version}")
++        STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" _minor_vers "${_requested_version}")
++        STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" _patch_vers "${_requested_version}")
++    else (_threePartMatch)
++        STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" _major_vers "${_requested_version}")
++        STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" _minor_vers "${_requested_version}")
++        set(_patch_vers "0")
++    endif (_threePartMatch)
++
++    # compute an overall version number which can be compared at once
++    MATH(EXPR ${_normalized_version} "${_major_vers}*10000 + ${_minor_vers}*100 + ${_patch_vers}")
++ENDMACRO(NORMALIZE_VERSION)
++
++MACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER _lower_limit _value _upper_limit _ok)
++   if (${_value} LESS ${_lower_limit})
++      set( ${_ok} FALSE )
++  elseif (${_value} EQUAL ${_lower_limit})
++      set( ${_ok} TRUE )
++  elseif (${_value} EQUAL ${_upper_limit})
++      set( ${_ok} FALSE )
++  elseif (${_value} GREATER ${_upper_limit})
++      set( ${_ok} FALSE )
++  else (${_value} LESS ${_lower_limit})
++      set( ${_ok} TRUE )
++  endif (${_value} LESS ${_lower_limit})
++ENDMACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER)
++
++MACRO(MACRO_ENSURE_VERSION requested_version found_version var_too_old)
++    NORMALIZE_VERSION( ${requested_version} req_vers_num )
++    NORMALIZE_VERSION( ${found_version} found_vers_num )
++
++    if (found_vers_num LESS req_vers_num)
++        set( ${var_too_old} FALSE )
++    else (found_vers_num LESS req_vers_num)
++        set( ${var_too_old} TRUE )
++    endif (found_vers_num LESS req_vers_num)
++
++ENDMACRO(MACRO_ENSURE_VERSION)
++
++MACRO(MACRO_ENSURE_VERSION2 requested_version2 found_version2 var_too_old2)
++    MACRO_ENSURE_VERSION( ${requested_version2} ${found_version2} ${var_too_old2})
++ENDMACRO(MACRO_ENSURE_VERSION2)
++
++MACRO(MACRO_ENSURE_VERSION_RANGE min_version found_version max_version var_ok)
++    NORMALIZE_VERSION( ${min_version} req_vers_num )
++    NORMALIZE_VERSION( ${found_version} found_vers_num )
++    NORMALIZE_VERSION( ${max_version} max_vers_num )
++
++    MACRO_CHECK_RANGE_INCLUSIVE_LOWER( ${req_vers_num} ${found_vers_num} ${max_vers_num} ${var_ok})
++ENDMACRO(MACRO_ENSURE_VERSION_RANGE)
++
++
diff --git a/source.local/l/phonon-xine/phonon-xine.SlackBuild b/source.local/l/phonon-xine/phonon-xine.SlackBuild
new file mode 100755
index 0000000..4826aed
--- /dev/null
+++ b/source.local/l/phonon-xine/phonon-xine.SlackBuild
@@ -0,0 +1,134 @@
+#!/bin/sh
+# Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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.
+# -----------------------------------------------------------------------------
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=phonon-xine
+SRCNAM=phonon-backend-xine
+VERSION=${VERSION:-4.4.4}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION || exit 1
+
+# Use better phonon detection routine:
+cat $CWD/phonon-backend-xine-4.4.4.find.phonon.patch | patch -p1 --verbose || exit 1
+
+# Switch from oxygen to hicolor icons. This way they are visible,
+# even when the current icon theme is not oxygen.
+for res in 16 22 32 48 64 128 sc ; do
+  mv xine/ox${res}-app-phonon-xine.png xine/hi${res}-app-phonon-xine.png
+done
+
+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 {} \;
+
+echo Building ...
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+  make $NUMJOBS
+  make DESTDIR=$PKG install
+cd -
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING.LIB xine/BUGS \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# Compress the man page(s):
+if [ -d $PKG/usr/man ]; then
+  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).
+gz $i.gz ; rm $i ; done
+fi
+
+# Strip binaries (if any):
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Add a package description:
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/phonon-xine/slack-desc b/source.local/l/phonon-xine/slack-desc
new file mode 100644
index 0000000..59ee7f0
--- /dev/null
+++ b/source.local/l/phonon-xine/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 ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+phonon-xine: phonon-xine (xine backend for phonon)
+phonon-xine:
+phonon-xine: This package provides an additional xine backend for the phonon
+phonon-xine: multimedia framework used in KDE.
+phonon-xine:
+phonon-xine: For more information, visit:
+phonon-xine:   https://projects.kde.org/projects/kdesupport/phonon/phonon-xine
+phonon-xine:
+phonon-xine:
+phonon-xine:
+phonon-xine:
diff --git a/source.local/l/phonon/phonon.SlackBuild b/source.local/l/phonon/phonon.SlackBuild
index 192473f..8c82a44 100755
--- a/source.local/l/phonon/phonon.SlackBuild
+++ b/source.local/l/phonon/phonon.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh 
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010  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,42 +21,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
 
 
 PKGNAM=phonon
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-4.6.0}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+NUMJOBS=${NUMJOBS:--j7}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
@@ -67,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -r $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -85,6 +86,9 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \
+    -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
+    -DWITH_QZeitgeist=BOOL:OFF \
     ..
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source.local/l/phonon/slack-desc b/source.local/l/phonon/slack-desc
index a4fbd02..12acecb 100644
--- a/source.local/l/phonon/slack-desc
+++ b/source.local/l/phonon/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 phonon: phonon (multimedia framework for KDE4)
 phonon:
-phonon: Phonon is the multimedia framework for KDE4.  This package contains
-phonon: the xine and gstreamer backends and support files for KDE.  The
-phonon: Phonon library itself is included with Qt.
-phonon:
-phonon:
+phonon: Phonon is the multimedia API provided by Qt and is the standard
+phonon: abstraction for handling multimedia streams within the KDE Software
+phonon: Compilation.  Phonon provides an API for multimedia using various
+phonon: backends (gstreamer, mplayer, xine) to handle the lower level I/O.
 phonon:
+phonon: Homepage:  http://phonon.kde.org
 phonon:
 phonon:
 phonon:
diff --git a/source.local/l/pil/pil.SlackBuild b/source.local/l/pil/pil.SlackBuild
new file mode 100755
index 0000000..16de30b
--- /dev/null
+++ b/source.local/l/pil/pil.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Copyright 2009, 2010  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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=pil
+ARCNAM=Imaging
+VERSION=${VERSION:-1.1.7}
+BUILD=${BUILD:-2}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $ARCNAM-$VERSION
+tar xvf $CWD/$ARCNAM-$VERSION.tar.*z* || exit 1
+cd $ARCNAM-$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 {} \;
+
+python setup.py build_ext -i || exit 1
+python setup.py install --root=$PKG || exit 1
+
+( cd Sane
+  python setup.py build || exit 1
+  python setup.py install --root=$PKG || exit 1
+)
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  BUILDME CONTENTS MANIFEST README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a Sane/README $PKG/usr/doc/$PKGNAM-$VERSION/README.Sane
+
+# 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 CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/pil/slack-desc b/source.local/l/pil/slack-desc
new file mode 100644
index 0000000..1e48b57
--- /dev/null
+++ b/source.local/l/pil/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 ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+pil: pil (Python Imaging Library)
+pil:
+pil: The Python Imaging Library (PIL) adds image processing capabilities
+pil: to your Python environment.  This library provides extensive file
+pil: format support, an efficient internal representation, and powerful
+pil: image processing capabilities.
+pil:
+pil: PIL is used by the scanning component of HPLIP.
+pil:
+pil: PIL homepage:  http://www.pythonware.com/products/pil/
+pil:
diff --git a/source.local/l/pilot-link/pilot-link.SlackBuild b/source.local/l/pilot-link/pilot-link.SlackBuild
index b686281..dd7eec2 100755
--- a/source.local/l/pilot-link/pilot-link.SlackBuild
+++ b/source.local/l/pilot-link/pilot-link.SlackBuild
@@ -24,37 +24,38 @@
 
 
 VERSION=${VERSION:-0.12.5}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-6}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/pilot-link/pilot-link.png14.diff.gz b/source.local/l/pilot-link/pilot-link.png14.diff.gz
index 44fe195..bf0edeb 100644
--- a/source.local/l/pilot-link/pilot-link.png14.diff.gz
+++ b/source.local/l/pilot-link/pilot-link.png14.diff.gz
diff --git a/source.local/l/polkit-gnome/polkit-gnome.SlackBuild b/source.local/l/polkit-gnome/polkit-gnome.SlackBuild
index 07703a0..2ba0755 100755
--- a/source.local/l/polkit-gnome/polkit-gnome.SlackBuild
+++ b/source.local/l/polkit-gnome/polkit-gnome.SlackBuild
@@ -22,42 +22,43 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=polkit-gnome
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.102}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -93,7 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --disable-gtk-doc \
   --disable-static \
-  --disable-introspection \
+  --enable-introspection \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
@@ -111,8 +112,17 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a AUTHORS COPYING HACKING 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
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/polkit-qt-1/polkit-qt-1.SlackBuild b/source.local/l/polkit-qt-1/polkit-qt-1.SlackBuild
new file mode 100755
index 0000000..4eaed34
--- /dev/null
+++ b/source.local/l/polkit-qt-1/polkit-qt-1.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Copyright 2009, 2010, 2011, 2012  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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=polkit-qt-1
+VERSION=${VERSION:-0.103.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+# Avoid a version number in .la files:
+if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
+cd $TMP
+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 \) \
+ -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 build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+if [ -d $PKG/usr/man ]; then
+  gzip -9 $PKG/usr/man/man?/*
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING* README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/polkit-qt-1/pull-polkit-qt-1 b/source.local/l/polkit-qt-1/pull-polkit-qt-1
new file mode 100644
index 0000000..42d6487
--- /dev/null
+++ b/source.local/l/polkit-qt-1/pull-polkit-qt-1
@@ -0,0 +1,6 @@
+rm -rf polkit-qt-1
+git clone git://anongit.kde.org/polkit-qt-1
+( cd polkit-qt-1 && rm -rf .git* )
+mv polkit-qt-1 polkit-qt-1-$(date +%Y%m%d)git
+tar cf polkit-qt-1-$(date +%Y%m%d)git.tar polkit-qt-1-$(date +%Y%m%d)git
+xz -9 polkit-qt-1-$(date +%Y%m%d)git.tar
diff --git a/source.local/l/polkit-qt-1/slack-desc b/source.local/l/polkit-qt-1/slack-desc
new file mode 100644
index 0000000..ed2cf40
--- /dev/null
+++ b/source.local/l/polkit-qt-1/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 ':'.
+
+           |-----handy-ruler-----------------------------------------------------|
+polkit-qt-1: polkit-qt-1 (Qt polkit API wrapper)
+polkit-qt-1:
+polkit-qt-1: polkit-qt-1 aims to make it easy for Qt developers to take advantage
+polkit-qt-1: of the polkit API.  It is a convenience wrapper around QAction and
+polkit-qt-1: QAbstractButton that lets you integrate those two components
+polkit-qt-1: easily with polkit.
+polkit-qt-1:
+polkit-qt-1: Homepage: http://techbase.kde.org/Polkit-Qt-1
+polkit-qt-1:
+polkit-qt-1:
+polkit-qt-1:
diff --git a/source.local/l/polkit/05_revert-admin-identities-unix-group-wheel.patch.gz b/source.local/l/polkit/05_revert-admin-identities-unix-group-wheel.patch.gz
new file mode 100644
index 0000000..b384452
--- /dev/null
+++ b/source.local/l/polkit/05_revert-admin-identities-unix-group-wheel.patch.gz
diff --git a/source.local/l/polkit/10-org.freedesktop.NetworkManager.pkla b/source.local/l/polkit/10-org.freedesktop.NetworkManager.pkla
new file mode 100644
index 0000000..b249160
--- /dev/null
+++ b/source.local/l/polkit/10-org.freedesktop.NetworkManager.pkla
@@ -0,0 +1,6 @@
+[nm-applet]
+Identity=unix-group:netdev
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
diff --git a/source.local/l/polkit/20-plugdev-group-mount-override.pkla b/source.local/l/polkit/20-plugdev-group-mount-override.pkla
new file mode 100644
index 0000000..8149de6
--- /dev/null
+++ b/source.local/l/polkit/20-plugdev-group-mount-override.pkla
@@ -0,0 +1,6 @@
+[plugdev group mount override]
+Identity=unix-group:plugdev
+Action=org.freedesktop.udisks2.filesystem-*;org.freedesktop.udisks2.eject-*
+ResultAny=yes
+ResultInactive=yes
+ResultActive=yes
diff --git a/source.local/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch b/source.local/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch
deleted file mode 100644
index 9431056..0000000
--- a/source.local/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Thu, 31 Mar 2011 12:59:09 -0400
-Subject: [PATCH 1/4] PolkitUnixProcess: Clarify that the real uid is
- returned, not the effective one
-
-On Linux, also switch to parsing /proc/<pid>/status instead of relying
-on the st_uid returned by stat(2) to be the uid we want.
-
-This was pointed out by Neel Mehta <nmehta@google.com>. Thanks!
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
- src/polkit/polkitunixprocess.c |   66 ++++++++++++++++++++++++++++++----------
- 1 files changed, 50 insertions(+), 16 deletions(-)
-
-diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index d95a1d4..876da69 100644
---- a/src/polkit/polkitunixprocess.c
-+++ b/src/polkit/polkitunixprocess.c
-@@ -24,9 +24,7 @@
- #endif
- 
- #include <sys/types.h>
--#ifndef HAVE_FREEBSD
--#include <sys/stat.h>
--#else
-+#ifdef HAVE_FREEBSD
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <sys/user.h>
-@@ -34,6 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-+#include <stdio.h>
- 
- #include "polkitunixprocess.h"
- #include "polkitsubject.h"
-@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process)
-  *
-  * Gets the uid of the owner of @process.
-  *
-+ * Note that this returns the real user-id (not the effective user-id) of @process.
-+ *
-  * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
-  **/
- gint
-@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-                                GError            **error)
- {
-   gint result;
-+  gchar *contents;
-+  gchar **lines;
- #ifdef HAVE_FREEBSD
-   struct kinfo_proc p;
- #else
--  struct stat statbuf;
--  char procbuf[32];
-+  gchar filename[64];
-+  guint n;
- #endif
- 
-   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
-   g_return_val_if_fail (error == NULL || *error == NULL, 0);
- 
-   result = 0;
-+  lines = NULL;
-+  contents = NULL;
- 
- #ifdef HAVE_FREEBSD
-   if (get_kinfo_proc (process->pid, &p) == 0)
-@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
- 
-   result = p.ki_uid;
- #else
--  g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid);
--  if (stat (procbuf, &statbuf) != 0)
-+
-+  /* see 'man proc' for layout of the status file
-+   *
-+   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
-+   */
-+  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
-+  if (!g_file_get_contents (filename,
-+                            &contents,
-+                            NULL,
-+                            error))
-     {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_FAILED,
--                   "stat() failed for /proc/%d: %s",
--                   process->pid,
--                   g_strerror (errno));
-       goto out;
-     }
-+  lines = g_strsplit (contents, "\n", -1);
-+  for (n = 0; lines != NULL && lines[n] != NULL; n++)
-+    {
-+      gint real_uid, effective_uid;
-+      if (!g_str_has_prefix (lines[n], "Uid:"))
-+        continue;
-+      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
-+        {
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unexpected line `%s' in file %s",
-+                       lines[n],
-+                       filename);
-+          goto out;
-+        }
-+      else
-+        {
-+          result = real_uid;
-+          goto out;
-+        }
-+    }
- 
--  result = statbuf.st_uid;
-+  g_set_error (error,
-+               POLKIT_ERROR,
-+               POLKIT_ERROR_FAILED,
-+               "Didn't find any line starting with `Uid:' in file %s",
-+               filename);
- #endif
- 
-- out:
--
-+out:
-+  g_strfreev (lines);
-+  g_free (contents);
-   return result;
- }
- 
--- 
-1.7.4.4
-
diff --git a/source.local/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch b/source.local/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch
deleted file mode 100644
index 81a163c..0000000
--- a/source.local/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch
+++ /dev/null
@@ -1,623 +0,0 @@
-From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 1 Apr 2011 12:09:45 -0400
-Subject: [PATCH 2/4] Make PolkitUnixProcess also record the uid of the
- process
-
-This is needed to avoid possible TOCTTOU issues since a process can
-change both its real uid and effective uid.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
- docs/polkit/polkit-1-sections.txt |    7 +-
- src/polkit/polkitsubject.c        |   25 +++-
- src/polkit/polkitunixprocess.c    |  346 +++++++++++++++++++++++++------------
- src/polkit/polkitunixprocess.h    |   18 ++-
- 4 files changed, 278 insertions(+), 118 deletions(-)
-
-diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt
-index 12141e3..9f4fcf8 100644
---- a/docs/polkit/polkit-1-sections.txt
-+++ b/docs/polkit/polkit-1-sections.txt
-@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS
- PolkitUnixProcess
- polkit_unix_process_new
- polkit_unix_process_new_full
-+polkit_unix_process_new_for_owner
-+polkit_unix_process_set_pid
- polkit_unix_process_get_pid
-+polkit_unix_process_set_start_time
- polkit_unix_process_get_start_time
--polkit_unix_process_set_pid
--polkit_unix_process_get_owner
-+polkit_unix_process_set_uid
-+polkit_unix_process_get_uid
- <SUBSECTION Standard>
- PolkitUnixProcessClass
- POLKIT_UNIX_PROCESS
-diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
-index 577afec..d2c4c20 100644
---- a/src/polkit/polkitsubject.c
-+++ b/src/polkit/polkitsubject.c
-@@ -238,13 +238,18 @@ polkit_subject_from_string  (const gchar   *str,
-     {
-       gint scanned_pid;
-       guint64 scanned_starttime;
--      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
-+      gint scanned_uid;
-+      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3)
-+        {
-+          subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid);
-+        }
-+      else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
-         {
-           subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime);
-         }
-       else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1)
-         {
--          subject = polkit_unix_process_new_full (scanned_pid, 0);
-+          subject = polkit_unix_process_new (scanned_pid);
-           if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0)
-             {
-               g_object_unref (subject);
-@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject)
-                              g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))));
-       g_variant_builder_add (&builder, "{sv}", "start-time",
-                              g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject))));
-+      g_variant_builder_add (&builder, "{sv}", "uid",
-+                             g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject))));
-     }
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
-@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
-       GVariant *v;
-       guint32 pid;
-       guint64 start_time;
-+      gint32 uid;
- 
-       v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error);
-       if (v == NULL)
-@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
-       start_time = g_variant_get_uint64 (v);
-       g_variant_unref (v);
- 
--      ret = polkit_unix_process_new_full (pid, start_time);
-+      v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error);
-+      if (v != NULL)
-+        {
-+          uid = g_variant_get_int32 (v);
-+          g_variant_unref (v);
-+        }
-+      else
-+        {
-+          uid = -1;
-+        }
-+
-+      ret = polkit_unix_process_new_for_owner (pid, start_time, uid);
-     }
-   else if (g_strcmp0 (kind, "unix-session") == 0)
-     {
-diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index 876da69..913be3a 100644
---- a/src/polkit/polkitunixprocess.c
-+++ b/src/polkit/polkitunixprocess.c
-@@ -62,6 +62,7 @@ struct _PolkitUnixProcess
- 
-   gint pid;
-   guint64 start_time;
-+  gint uid;
- };
- 
- struct _PolkitUnixProcessClass
-@@ -74,6 +75,7 @@ enum
-   PROP_0,
-   PROP_PID,
-   PROP_START_TIME,
-+  PROP_UID
- };
- 
- static void subject_iface_init (PolkitSubjectIface *subject_iface);
-@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface);
- static guint64 get_start_time_for_pid (gint    pid,
-                                        GError **error);
- 
-+static gint _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                                            GError            **error);
-+
- #ifdef HAVE_FREEBSD
- static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p);
- #endif
-@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT,
- static void
- polkit_unix_process_init (PolkitUnixProcess *unix_process)
- {
-+  unix_process->uid = -1;
- }
- 
- static void
-@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject    *object,
-       g_value_set_int (value, unix_process->pid);
-       break;
- 
-+    case PROP_UID:
-+      g_value_set_int (value, unix_process->uid);
-+      break;
-+
-     case PROP_START_TIME:
-       g_value_set_uint64 (value, unix_process->start_time);
-       break;
-@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject      *object,
-       polkit_unix_process_set_pid (unix_process, g_value_get_int (value));
-       break;
- 
-+    case PROP_UID:
-+      polkit_unix_process_set_uid (unix_process, g_value_get_int (value));
-+      break;
-+
-+    case PROP_START_TIME:
-+      polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value));
-+      break;
-+
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-       break;
-@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject      *object,
- }
- 
- static void
-+polkit_unix_process_constructed (GObject *object)
-+{
-+  PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object);
-+
-+  /* sets start_time and uid in case they are unset */
-+
-+  if (process->start_time == 0)
-+    process->start_time = get_start_time_for_pid (process->pid, NULL);
-+
-+  if (process->uid == -1)
-+    {
-+      GError *error;
-+      error = NULL;
-+      process->uid = _polkit_unix_process_get_owner (process, &error);
-+      if (error != NULL)
-+        {
-+          process->uid = -1;
-+          g_error_free (error);
-+        }
-+    }
-+
-+  if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL)
-+    G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object);
-+}
-+
-+static void
- polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
- {
-   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- 
-   gobject_class->get_property = polkit_unix_process_get_property;
-   gobject_class->set_property = polkit_unix_process_set_property;
-+  gobject_class->constructed =  polkit_unix_process_constructed;
- 
-   /**
-    * PolkitUnixProcess:pid:
-@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                    g_param_spec_int ("pid",
-                                                      "Process ID",
-                                                      "The UNIX process ID",
--                                                     -1,
-+                                                     0,
-                                                      G_MAXINT,
-                                                      0,
-                                                      G_PARAM_CONSTRUCT |
-@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                                      G_PARAM_STATIC_NICK));
- 
-   /**
-+   * PolkitUnixProcess:uid:
-+   *
-+   * The UNIX user id of the process or -1 if unknown.
-+   *
-+   * Note that this is the real user-id, not the effective user-id.
-+   */
-+  g_object_class_install_property (gobject_class,
-+                                   PROP_UID,
-+                                   g_param_spec_int ("uid",
-+                                                     "User ID",
-+                                                     "The UNIX user ID",
-+                                                     -1,
-+                                                     G_MAXINT,
-+                                                     -1,
-+                                                     G_PARAM_CONSTRUCT |
-+                                                     G_PARAM_READWRITE |
-+                                                     G_PARAM_STATIC_NAME |
-+                                                     G_PARAM_STATIC_BLURB |
-+                                                     G_PARAM_STATIC_NICK));
-+
-+  /**
-    * PolkitUnixProcess:start-time:
-    *
-    * The start time of the process.
-@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                                         0,
-                                                         G_MAXUINT64,
-                                                         0,
--                                                        G_PARAM_READABLE |
-+                                                        G_PARAM_CONSTRUCT |
-+                                                        G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_BLURB |
-                                                         G_PARAM_STATIC_NICK));
-@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
- }
- 
- /**
-- * polkit_unix_process_get_pid:
-+ * polkit_unix_process_get_uid:
-  * @process: A #PolkitUnixProcess.
-  *
-- * Gets the process id for @process.
-+ * Gets the user id for @process. Note that this is the real user-id,
-+ * not the effective user-id.
-  *
-- * Returns: The process id for @process.
-+ * Returns: The user id for @process or -1 if unknown.
-  */
- gint
--polkit_unix_process_get_pid (PolkitUnixProcess *process)
-+polkit_unix_process_get_uid (PolkitUnixProcess *process)
- {
--  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
--  return process->pid;
-+  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1);
-+  return process->uid;
- }
- 
- /**
-- * polkit_unix_process_get_owner:
-+ * polkit_unix_process_set_uid:
-  * @process: A #PolkitUnixProcess.
-- * @error: (allow-none): Return location for error or %NULL.
-+ * @uid: The user id to set for @process or -1 to unset it.
-  *
-- * Gets the uid of the owner of @process.
-+ * Sets the (real, not effective) user id for @process.
-+ */
-+void
-+polkit_unix_process_set_uid (PolkitUnixProcess *process,
-+                             gint               uid)
-+{
-+  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-+  g_return_if_fail (uid >= -1);
-+  process->uid = uid;
-+}
-+
-+/**
-+ * polkit_unix_process_get_pid:
-+ * @process: A #PolkitUnixProcess.
-  *
-- * Note that this returns the real user-id (not the effective user-id) of @process.
-+ * Gets the process id for @process.
-  *
-- * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
-- **/
-+ * Returns: The process id for @process.
-+ */
- gint
--polkit_unix_process_get_owner (PolkitUnixProcess  *process,
--                               GError            **error)
-+polkit_unix_process_get_pid (PolkitUnixProcess *process)
- {
--  gint result;
--  gchar *contents;
--  gchar **lines;
--#ifdef HAVE_FREEBSD
--  struct kinfo_proc p;
--#else
--  gchar filename[64];
--  guint n;
--#endif
--
-   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
--  g_return_val_if_fail (error == NULL || *error == NULL, 0);
--
--  result = 0;
--  lines = NULL;
--  contents = NULL;
--
--#ifdef HAVE_FREEBSD
--  if (get_kinfo_proc (process->pid, &p) == 0)
--    {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_FAILED,
--                   "get_kinfo_proc() failed for pid %d: %s",
--                   process->pid,
--                   g_strerror (errno));
--      goto out;
--    }
--
--  result = p.ki_uid;
--#else
--
--  /* see 'man proc' for layout of the status file
--   *
--   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
--   */
--  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
--  if (!g_file_get_contents (filename,
--                            &contents,
--                            NULL,
--                            error))
--    {
--      goto out;
--    }
--  lines = g_strsplit (contents, "\n", -1);
--  for (n = 0; lines != NULL && lines[n] != NULL; n++)
--    {
--      gint real_uid, effective_uid;
--      if (!g_str_has_prefix (lines[n], "Uid:"))
--        continue;
--      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
--        {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Unexpected line `%s' in file %s",
--                       lines[n],
--                       filename);
--          goto out;
--        }
--      else
--        {
--          result = real_uid;
--          goto out;
--        }
--    }
--
--  g_set_error (error,
--               POLKIT_ERROR,
--               POLKIT_ERROR_FAILED,
--               "Didn't find any line starting with `Uid:' in file %s",
--               filename);
--#endif
--
--out:
--  g_strfreev (lines);
--  g_free (contents);
--  return result;
-+  return process->pid;
- }
- 
- /**
-@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process)
- }
- 
- /**
-+ * polkit_unix_process_set_start_time:
-+ * @process: A #PolkitUnixProcess.
-+ * @start_time: The start time for @pid.
-+ *
-+ * Set the start time of @process.
-+ */
-+void
-+polkit_unix_process_set_start_time (PolkitUnixProcess *process,
-+                                    guint64            start_time)
-+{
-+  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-+  process->start_time = start_time;
-+}
-+
-+/**
-  * polkit_unix_process_set_pid:
-  * @process: A #PolkitUnixProcess.
-  * @pid: A process id.
-@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process,
- {
-   g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-   process->pid = pid;
--  if (pid != (gint) -1)
--    process->start_time = get_start_time_for_pid (pid, NULL);
- }
- 
- /**
-  * polkit_unix_process_new:
-  * @pid: The process id.
-  *
-- * Creates a new #PolkitUnixProcess for @pid. The start time of the
-- * process will be looked up in using e.g. the
-- * <filename>/proc</filename> filesystem depending on the platform in
-- * use.
-+ * Creates a new #PolkitUnixProcess for @pid.
-+ *
-+ * The uid and start time of the process will be looked up in using
-+ * e.g. the <filename>/proc</filename> filesystem depending on the
-+ * platform in use.
-  *
-  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-  */
-@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid)
-  *
-  * Creates a new #PolkitUnixProcess object for @pid and @start_time.
-  *
-+ * The uid of the process will be looked up in using e.g. the
-+ * <filename>/proc</filename> filesystem depending on the platform in
-+ * use.
-+ *
-  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-  */
- PolkitSubject *
- polkit_unix_process_new_full (gint pid,
-                               guint64 start_time)
- {
--  PolkitUnixProcess *process;
--
--  process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1));
--  process->pid = pid;
--  if (start_time != 0)
--    process->start_time = start_time;
--  else
--    process->start_time = get_start_time_for_pid (pid, NULL);
-+  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
-+                                       "pid", pid,
-+                                       "start_time", start_time,
-+                                       NULL));
-+}
- 
--  return POLKIT_SUBJECT (process);
-+/**
-+ * polkit_unix_process_new_for_owner:
-+ * @pid: The process id.
-+ * @start_time: The start time for @pid or 0 to look it up in e.g. <filename>/proc</filename>.
-+ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. <filename>/proc</filename>.
-+ *
-+ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid.
-+ *
-+ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-+ */
-+PolkitSubject *
-+polkit_unix_process_new_for_owner (gint    pid,
-+                                   guint64 start_time,
-+                                   gint    uid)
-+{
-+  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
-+                                       "pid", pid,
-+                                       "start_time", start_time,
-+                                       "uid", uid,
-+                                       NULL));
- }
- 
- static guint
-@@ -616,3 +654,95 @@ out:
- 
-   return start_time;
- }
-+
-+static gint
-+_polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                                GError            **error)
-+{
-+  gint result;
-+  gchar *contents;
-+  gchar **lines;
-+#ifdef HAVE_FREEBSD
-+  struct kinfo_proc p;
-+#else
-+  gchar filename[64];
-+  guint n;
-+#endif
-+
-+  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
-+  g_return_val_if_fail (error == NULL || *error == NULL, 0);
-+
-+  result = 0;
-+  lines = NULL;
-+  contents = NULL;
-+
-+#ifdef HAVE_FREEBSD
-+  if (get_kinfo_proc (process->pid, &p) == 0)
-+    {
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "get_kinfo_proc() failed for pid %d: %s",
-+                   process->pid,
-+                   g_strerror (errno));
-+      goto out;
-+    }
-+
-+  result = p.ki_uid;
-+#else
-+
-+  /* see 'man proc' for layout of the status file
-+   *
-+   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
-+   */
-+  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
-+  if (!g_file_get_contents (filename,
-+                            &contents,
-+                            NULL,
-+                            error))
-+    {
-+      goto out;
-+    }
-+  lines = g_strsplit (contents, "\n", -1);
-+  for (n = 0; lines != NULL && lines[n] != NULL; n++)
-+    {
-+      gint real_uid, effective_uid;
-+      if (!g_str_has_prefix (lines[n], "Uid:"))
-+        continue;
-+      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
-+        {
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unexpected line `%s' in file %s",
-+                       lines[n],
-+                       filename);
-+          goto out;
-+        }
-+      else
-+        {
-+          result = real_uid;
-+          goto out;
-+        }
-+    }
-+
-+  g_set_error (error,
-+               POLKIT_ERROR,
-+               POLKIT_ERROR_FAILED,
-+               "Didn't find any line starting with `Uid:' in file %s",
-+               filename);
-+#endif
-+
-+out:
-+  g_strfreev (lines);
-+  g_free (contents);
-+  return result;
-+}
-+
-+/* deprecated public method */
-+gint
-+polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                               GError            **error)
-+{
-+  return _polkit_unix_process_get_owner (process, error);
-+}
-diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h
-index b88cd03..531a57d 100644
---- a/src/polkit/polkitunixprocess.h
-+++ b/src/polkit/polkitunixprocess.h
-@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess;
- typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass;
- 
- GType           polkit_unix_process_get_type       (void) G_GNUC_CONST;
--PolkitSubject  *polkit_unix_process_new            (gint pid);
--PolkitSubject  *polkit_unix_process_new_full       (gint pid,
--                                                    guint64 start_time);
--
-+PolkitSubject  *polkit_unix_process_new            (gint               pid);
-+PolkitSubject  *polkit_unix_process_new_full       (gint               pid,
-+                                                    guint64            start_time);
-+PolkitSubject  *polkit_unix_process_new_for_owner  (gint               pid,
-+                                                    guint64            start_time,
-+                                                    gint               uid);
- gint            polkit_unix_process_get_pid        (PolkitUnixProcess *process);
- guint64         polkit_unix_process_get_start_time (PolkitUnixProcess *process);
-+gint            polkit_unix_process_get_uid        (PolkitUnixProcess *process);
- void            polkit_unix_process_set_pid        (PolkitUnixProcess *process,
-                                                     gint               pid);
-+void            polkit_unix_process_set_uid        (PolkitUnixProcess *process,
-+                                                    gint               uid);
-+void            polkit_unix_process_set_start_time (PolkitUnixProcess *process,
-+                                                    guint64            start_time);
-+
- gint            polkit_unix_process_get_owner      (PolkitUnixProcess  *process,
--                                                    GError            **error);
-+                                                    GError            **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid);
- 
- G_END_DECLS
- 
--- 
-1.7.4.4
-
diff --git a/source.local/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch b/source.local/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch
deleted file mode 100644
index 90d9352..0000000
--- a/source.local/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 1 Apr 2011 12:12:27 -0400
-Subject: [PATCH 3/4] Use polkit_unix_process_get_uid() to get the owner of a
- process
-
-This avoids a TOCTTOU problem.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
- src/polkitbackend/polkitbackendsessionmonitor.c |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
-index 495f752..9c331b6 100644
---- a/src/polkitbackend/polkitbackendsessionmonitor.c
-+++ b/src/polkitbackend/polkitbackendsessionmonitor.c
-@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      local_error = NULL;
--      uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error);
--      if (local_error != NULL)
-+      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
-+      if ((gint) uid == -1)
-         {
--          g_propagate_prefixed_error (error, local_error, "Error getting user for process: ");
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unix process subject does not have uid set");
-           goto out;
-         }
--
-       ret = polkit_unix_user_new (uid);
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
--- 
-1.7.4.4
-
diff --git a/source.local/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch b/source.local/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch
deleted file mode 100644
index 8572f73..0000000
--- a/source.local/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 1 Apr 2011 12:13:15 -0400
-Subject: [PATCH 4/4] pkexec: Avoid TOCTTOU problems with parent process
-
-In a nutshell, the parent process may change its uid (either real- or
-effective uid) after launching pkexec. It can do this by exec()'ing
-e.g. a setuid root program.
-
-To avoid this problem, just use the uid the parent process had when it
-executed pkexec. This happens to be the same uid of the pkexec process
-itself.
-
-Additionally, remove some dubious code that allowed pkexec to continue
-when the parent process died as there is no reason to support
-something like that. Also ensure that the pkexec process is killed if
-the parent process dies.
-
-This problem was pointed out by Neel Mehta <nmehta@google.com>.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
- src/programs/pkexec.c |   66 +++++++++++++++++++++++++++++--------------------
- 1 files changed, 39 insertions(+), 27 deletions(-)
-
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 9217954..3e656be 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -35,6 +35,10 @@
- #include <pwd.h>
- #include <errno.h>
- 
-+#ifdef __linux__
-+#include <sys/prctl.h>
-+#endif
-+
- #include <glib/gi18n.h>
- 
- #ifdef POLKIT_AUTHFW_PAM
-@@ -423,7 +427,6 @@ main (int argc, char *argv[])
-   GPtrArray *saved_env;
-   gchar *opt_user;
-   pid_t pid_of_caller;
--  uid_t uid_of_caller;
-   gpointer local_agent_handle;
- 
-   ret = 127;
-@@ -598,40 +601,49 @@ main (int argc, char *argv[])
-    */
-   g_type_init ();
- 
--  /* now check if the program that invoked us is authorized */
-+  /* make sure we are nuked if the parent process dies */
-+#ifdef __linux__
-+  if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0)
-+    {
-+      g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno));
-+      goto out;
-+    }
-+#else
-+#warning "Please add OS specific code to catch when the parent dies"
-+#endif
-+
-+  /* Figure out the parent process */
-   pid_of_caller = getppid ();
-   if (pid_of_caller == 1)
-     {
-       /* getppid() can return 1 if the parent died (meaning that we are reaped
--       * by /sbin/init); get process group leader instead - for example, this
--       * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit').
-+       * by /sbin/init); In that case we simpy bail.
-        */
--      pid_of_caller = getpgrp ();
--    }
--
--  subject = polkit_unix_process_new (pid_of_caller);
--  if (subject == NULL)
--    {
--      g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message);
--      g_error_free (error);
-+      g_printerr ("Refusing to render service to dead parents.\n");
-       goto out;
-     }
- 
--  /* paranoia: check that the uid of pid_of_caller matches getuid() */
--  error = NULL;
--  uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject),
--                                                 &error);
--  if (error != NULL)
--    {
--      g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message);
--      g_error_free (error);
--      goto out;
--    }
--  if (uid_of_caller != getuid ())
--    {
--      g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ());
--      goto out;
--    }
-+  /* This process we want to check an authorization for is the process
-+   * that launched us - our parent process.
-+   *
-+   * At the time the parent process fork()'ed and exec()'ed us, the
-+   * process had the same real-uid that we have now. So we use this
-+   * real-uid instead of of looking it up to avoid TOCTTOU issues
-+   * (consider the parent process exec()'ing a setuid helper).
-+   *
-+   * On the other hand, the monotonic process start-time is guaranteed
-+   * to never change so it's safe to look that up given only the PID
-+   * since we are guaranteed to be nuked if the parent goes away
-+   * (cf. the prctl(2) call above).
-+   */
-+  subject = polkit_unix_process_new_for_owner (pid_of_caller,
-+                                               0, /* 0 means "look up start-time in /proc" */
-+                                               getuid ());
-+  /* really double-check the invariants guaranteed by the PolkitUnixProcess class */
-+  g_assert (subject != NULL);
-+  g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller);
-+  g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0);
-+  g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0);
- 
-   error = NULL;
-   authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error);
--- 
-1.7.4.4
-
diff --git a/source.local/l/polkit/doinst.sh.gz b/source.local/l/polkit/doinst.sh.gz
new file mode 100644
index 0000000..5b51078
--- /dev/null
+++ b/source.local/l/polkit/doinst.sh.gz
diff --git a/source.local/l/polkit/polkit.SlackBuild b/source.local/l/polkit/polkit.SlackBuild
index a6d35bc..f646878 100755
--- a/source.local/l/polkit/polkit.SlackBuild
+++ b/source.local/l/polkit/polkit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2009, 2011  Robby Workman, Northport, Alabama, USA
 # Copyright 2010  Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -26,38 +26,39 @@
 
 
 PKGNAM=polkit
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.105}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -87,11 +88,7 @@ find . \
 # Allow successful compilation if we do not have docbook installed yet:
 zcat $CWD/polkit.docbook.patch.gz | patch -p1 --verbose || exit 1
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=692922
-patch -p1 < $CWD/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch || exit 1
-patch -p1 < $CWD/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch || exit 1
-patch -p1 < $CWD/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch || exit 1
-patch -p1 < $CWD/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch || exit 1
+zcat $CWD/05_revert-admin-identities-unix-group-wheel.patch.gz | patch -p1 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -105,7 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-gtk-doc \
   --mandir=/usr/man \
   --disable-static \
-  --disable-introspection \
+  --enable-introspection \
   --with-authfw=shadow \
   --enable-verbose-mode \
   --with-os-type=Slackware \
@@ -124,6 +121,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Add default policy files for udisks2 and NetworkManager events:
+cat $CWD/20-plugdev-group-mount-override.pkla > $PKG/etc/polkit-1/localauthority/50-local.d/20-plugdev-group-mount-override.pkla.new
+cat $CWD/10-org.freedesktop.NetworkManager.pkla > $PKG/etc/polkit-1/localauthority/50-local.d/10-org.freedesktop.NetworkManager.pkla.new
+
 # 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
@@ -146,12 +147,21 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \
+  AUTHORS COPYING HACKING INSTALL NEWS README \
   $PKG/usr/doc/$PKGNAM-$VERSION
 ( cd $PKG/usr/doc/$PKGNAM-$VERSION; ln -s ../../share/gtk-doc/html/polkit-1 html
 )
 
+# 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
+zcat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/source.local/l/poppler-data/poppler-data.SlackBuild b/source.local/l/poppler-data/poppler-data.SlackBuild
index 1c77ed9..a611782 100755
--- a/source.local/l/poppler-data/poppler-data.SlackBuild
+++ b/source.local/l/poppler-data/poppler-data.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 PKGNAM=poppler-data
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.4.5}
 ARCH=noarch
 BUILD=${BUILD:-1}
 
@@ -53,6 +53,14 @@ cp -a \
   COPYING* README \
   $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
 
diff --git a/source.local/l/poppler/poppler.SlackBuild b/source.local/l/poppler/poppler.SlackBuild
index 96ec956..a680f0d 100755
--- a/source.local/l/poppler/poppler.SlackBuild
+++ b/source.local/l/poppler/poppler.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=poppler
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.20.2}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -73,6 +74,10 @@ cd $TMP || exit 1
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
+
+# Fix printing of some pdf files:
+zcat $CWD/poppler_xyscale.patch.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -99,6 +104,7 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+# Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
     for manpagedir in $(find . -type d -name "man*") ; do
@@ -107,7 +113,7 @@ if [ -d $PKG/usr/man ]; then
           ln -s $( readlink $eachpage ).gz $eachpage.gz
           rm $eachpage
         done
-        gzip -9 *.*
+        gzip -9 *.?
       )
     done
   )
diff --git a/source.local/l/poppler/poppler_xyscale.patch.gz b/source.local/l/poppler/poppler_xyscale.patch.gz
new file mode 100644
index 0000000..a8fabf9
--- /dev/null
+++ b/source.local/l/poppler/poppler_xyscale.patch.gz
diff --git a/source.local/l/pycairo/pycairo.SlackBuild b/source.local/l/pycairo/pycairo.SlackBuild
index e5bf45d..74ee29e 100755
--- a/source.local/l/pycairo/pycairo.SlackBuild
+++ b/source.local/l/pycairo/pycairo.SlackBuild
@@ -28,41 +28,39 @@
 
 PKGNAM=pycairo
 SRCNAM=py2cairo
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.8.10}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/pycups/pycups.SlackBuild b/source.local/l/pycups/pycups.SlackBuild
index 847f259..c80005f 100755
--- a/source.local/l/pycups/pycups.SlackBuild
+++ b/source.local/l/pycups/pycups.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008 Heinz Wiesinger <hmwiesinger@gmx.at>
-# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,25 +22,29 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by Robby Workman <rworkman@slackware.com>
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=pycups
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.9.61}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
 fi
 
 CWD=$(pwd)
diff --git a/source.local/l/pycurl/pycurl.SlackBuild b/source.local/l/pycurl/pycurl.SlackBuild
new file mode 100755
index 0000000..47f8eaa
--- /dev/null
+++ b/source.local/l/pycurl/pycurl.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Copyright 2012  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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=pycurl
+VERSION=${VERSION:-7.19.0}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP || 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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+python setup.py build || exit 1
+python setup.py install --root=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "shared object" -e "executable" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a COPYING* NEWS README TODO \
+  doc/* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+rm -rf $PKG/usr/share/doc/pycurl
+rmdir $PKG/usr/share/doc
+rmdir $PKG/usr/share
+
+# 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/pycurl/slack-desc b/source.local/l/pycurl/slack-desc
new file mode 100644
index 0000000..0ba82db
--- /dev/null
+++ b/source.local/l/pycurl/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 ':'.
+
+      |-----handy-ruler----------------------------------------------|
+pycurl: pycurl (Python interface to cURL library)
+pycurl:
+pycurl: PycURL is a Python interface to libcurl.  PycURL can be used
+pycurl: to fetch objects identified by a URL from a Python program,
+pycurl: similar to the urllib Python module.  PycURL is mature, very
+pycurl: fast, and supports a lot of features.
+pycurl:
+pycurl: Homepage:  http://pycurl.sourceforge.net
+pycurl:
+pycurl:
+pycurl:
diff --git a/source.local/l/pygobject/pygobject.SlackBuild b/source.local/l/pygobject/pygobject.SlackBuild
index 9c6262d..3c4cd41 100755
--- a/source.local/l/pygobject/pygobject.SlackBuild
+++ b/source.local/l/pygobject/pygobject.SlackBuild
@@ -21,45 +21,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=pygobject
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.28.6}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -75,8 +73,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP 
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/pygobject.flags.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -84,8 +85,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/pygobject.fix.no.introspection.crash.diff.gz | patch -p1 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source.local/l/pygobject/pygobject.fix.no.introspection.crash.diff.gz b/source.local/l/pygobject/pygobject.fix.no.introspection.crash.diff.gz
deleted file mode 100644
index 50b3913..0000000
--- a/source.local/l/pygobject/pygobject.fix.no.introspection.crash.diff.gz
+++ /dev/null
diff --git a/source.local/l/pygobject/pygobject.flags.diff.gz b/source.local/l/pygobject/pygobject.flags.diff.gz
new file mode 100644
index 0000000..efa445a
--- /dev/null
+++ b/source.local/l/pygobject/pygobject.flags.diff.gz
diff --git a/source.local/l/pygtk/pygtk.SlackBuild b/source.local/l/pygtk/pygtk.SlackBuild
index c99a617..f926b1c 100755
--- a/source.local/l/pygtk/pygtk.SlackBuild
+++ b/source.local/l/pygtk/pygtk.SlackBuild
@@ -21,45 +21,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=pygtk
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.24.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -75,7 +73,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP || exit 1
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source.local/l/pyrex/pyrex.SlackBuild b/source.local/l/pyrex/pyrex.SlackBuild
index 68207c9..d203819 100755
--- a/source.local/l/pyrex/pyrex.SlackBuild
+++ b/source.local/l/pyrex/pyrex.SlackBuild
@@ -26,39 +26,37 @@
 
 PKGNAM=pyrex
 SRCNAM=Pyrex
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.9.9}
+BUILD=${BUILD:-2}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "${ARCH}" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
diff --git a/source.local/l/qca-ossl/qca-ossl.SlackBuild b/source.local/l/qca-ossl/qca-ossl.SlackBuild
index 2549aa5..26fd11d 100755
--- a/source.local/l/qca-ossl/qca-ossl.SlackBuild
+++ b/source.local/l/qca-ossl/qca-ossl.SlackBuild
@@ -26,36 +26,37 @@
 
 
 PKGNAM=qca-ossl
-VERSION=2.0.0_beta3
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.0.0_beta3}
+BUILD=${BUILD:-2}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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=""
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
diff --git a/source.local/l/qca/qca-2.0.2_gcc47.patch.gz b/source.local/l/qca/qca-2.0.2_gcc47.patch.gz
new file mode 100644
index 0000000..4a30b45
--- /dev/null
+++ b/source.local/l/qca/qca-2.0.2_gcc47.patch.gz
diff --git a/source.local/l/qca/qca.SlackBuild b/source.local/l/qca/qca.SlackBuild
index 4a889b0..a5ea50a 100755
--- a/source.local/l/qca/qca.SlackBuild
+++ b/source.local/l/qca/qca.SlackBuild
@@ -25,37 +25,38 @@
 # No additional license terms and no copyright claim
 
 PKGNAM=qca
-VERSION=2.0.2
+VERSION=${VERSION:-2.0.2}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
@@ -68,6 +69,10 @@ cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
 cd $PKGNAM-$VERSION || exit 1
+
+# Compensate for gcc 4.7:
+zcat $CWD/qca-2.0.2_gcc47.patch.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -79,7 +84,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX}
 
 make $NUMJOBS || make || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
diff --git a/source.local/l/qjson/qjson.SlackBuild b/source.local/l/qjson/qjson.SlackBuild
new file mode 100755
index 0000000..62d248c
--- /dev/null
+++ b/source.local/l/qjson/qjson.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Copyright 2013  Eric Hameleers, Eindhoven, NL
+# Copyright 2013  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=qjson
+VERSION=${VERSION:-0.8.1}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -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 build
+cd build
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  README.md COPYING.lib doc \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/qjson/slack-desc b/source.local/l/qjson/slack-desc
new file mode 100644
index 0000000..e134394
--- /dev/null
+++ b/source.local/l/qjson/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 ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+qjson: QJson (manage JSON objects with Qt)
+qjson:
+qjson: JSON (JavaScript Object Notation) is a lightweight data-interchange
+qjson: format. It can represents integer, real number, string, an ordered
+qjson: sequence of value, and a collection of name/value pairs.
+qjson: QJson is a qt-based library that maps JSON data to QVariant objects:
+qjson: JSON arrays will be mapped to QVariantList instances, while JSON's
+qjson: objects will be mapped to QVariantMap.
+qjson:
+qjson: http://qjson.sourceforge.net/
+qjson:
diff --git a/source.local/l/qt/Qt.pc b/source.local/l/qt/Qt.pc
index daa67b8..f4c0d59 100644
--- a/source.local/l/qt/Qt.pc
+++ b/source.local/l/qt/Qt.pc
@@ -13,4 +13,4 @@ translationdir=${prefix}/translations
 
 Name: Qt
 Description: Qt Configuration
-Version: 4.8.0
+Version: 4.8.1
diff --git a/source.local/l/qt/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz b/source.local/l/qt/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz
new file mode 100644
index 0000000..7a23632
--- /dev/null
+++ b/source.local/l/qt/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz
diff --git a/source.local/l/qt/qt.CVE-2011-3922.patch.gz b/source.local/l/qt/qt.CVE-2011-3922.patch.gz
deleted file mode 100644
index d3a47f9..0000000
--- a/source.local/l/qt/qt.CVE-2011-3922.patch.gz
+++ /dev/null
diff --git a/source.local/l/qt/qt.QUrl_toLocalFile.patch.gz b/source.local/l/qt/qt.QUrl_toLocalFile.patch.gz
deleted file mode 100644
index 04c3e5d..0000000
--- a/source.local/l/qt/qt.QUrl_toLocalFile.patch.gz
+++ /dev/null
diff --git a/source.local/l/qt/qt.SlackBuild b/source.local/l/qt/qt.SlackBuild
index 76de774..a35f270 100755
--- a/source.local/l/qt/qt.SlackBuild
+++ b/source.local/l/qt/qt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 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
@@ -37,10 +37,10 @@
 # wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched
 #
 # Modifications 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
-# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1 are built from original nokia sources.
+# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4 are built from original nokia sources.
 
 PKGNAM=qt
-VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VERSION=${VERSION:-4.8.4}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -101,31 +101,20 @@ find . \
  -exec chmod 644 {} \;
 
 if [ $ARCH = "i486" ]; then
-  sed -i -e "s/QMAKE_CFLAGS_RELEASE   += -O2/QMAKE_CFLAGS_RELEASE   += $SLKCFLAGS/" mkspecs/common/g++.conf || exit 1
-  #zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 || exit 1
+  sed -i -e "s/QMAKE_CFLAGS_RELEASE        += -O2/QMAKE_CFLAGS_RELEASE        += $SLKCFLAGS/" mkspecs/common/gcc-base.conf || exit 1
 fi
 
 # Fix path to mysql header
 zcat $CWD/qt.mysql.h.diff.gz | patch -p1 --verbose || exit 1
 
-## Fix broken QUrl_toLocalFile function which disables KDE sound (QTBUG-22382):
-# Fixed in qt 4.8.1
-#zcat $CWD/qt.QUrl_toLocalFile.patch.gz | patch -p1 --verbose || exit 1
-
-## Patch for security issue CVE-2011-3922:
-#zcat $CWD/qt.CVE-2011-3922.patch.gz | patch -p1 --verbose || exit 1
-
-# Patch for the use of gcc 4.7:
-zcat $CWD/qt.gcc47.patch.gz | patch -p1 --verbose || exit 1
-
 # gcc doesn't support flag "-fuse-ld=gold":
 zcat $CWD/qt.ld-gold.patch.gz | patch -p1 --verbose || exit 1
 
 # Stupid idea - remove it:
 zcat $CWD/qt.webkit-no_Werror.patch.gz | patch -p1 --verbose || exit 1
 
-# Fix for a crash bug which affects Qt 4.8.0 and 4.8.1:
-zcat $CWD/qt.qtbug-24718.patch.gz | patch -p1 --verbose || exit 1
+# Patch for boost-1.53:
+zcat $CWD/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz | patch -p1 --verbose || exit 1
 
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
@@ -145,6 +134,7 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
   -no-phonon \
   -nomake examples \
   -nomake demos \
+  -nomake docs \
   -no-separate-debug-info \
   -no-pch
   # No-precompiled-headers is ccache-friendly.
@@ -178,10 +168,13 @@ Description: Qt Configuration
 Version: $VERSION
 EOF
 
-# libjscore is used internally.  Prevent a false dependency on this in the .la files:
+# libjscore is used internally.  Prevent a false dependency on this in the .la and .pc files:
 sed -i "s,-ljscore,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
 sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
 
+# libwebcore is used internally.  Prevent a false dependency on this in the .la and .pc files:
+sed -i "s#-L/usr/lib${LIBDIRSUFFIX}/qt/lib -L../../WebCore/release -L../../JavaScriptCore/release -L/usr/X11R6/lib$LIBDIRSUFFIX  -lwebcore##g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/libQtWebKit.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/QtWebKit.pc
+
 # Link the shared libraries into /usr/lib:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
   for file in qt/lib/*.so* ; do
@@ -189,11 +182,6 @@ sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.l
   done
 )
 
-if [ $ARCH = "i486" ]; then
-  # Put this back as shipped:
-   zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 -R
-fi
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
@@ -221,6 +209,14 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
   done
 )
 
+# Install Qt's private headers - at least Gentoo and Fedora are adding these
+# and some software has (inevitably) started depending on them:
+# We're using `rsync -R` as easy way to preserve relative path names:
+rsync -aR \
+  include/Qt{Core,Declarative,Gui,Script}/private \
+  src/{corelib,declarative,gui,script}/*/*_p.h \
+  ${PKG}/usr/lib${LIBDIRSUFFIX}/qt/
+
 # Add menu entries for all those hidden but great Qt applications:
 # Qt logo:
 convert $PKG/usr/lib$LIBDIRSUFFIX/qt/doc/src/images/qt-logo.png  -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png
diff --git a/source.local/l/qt/qt.gcc47.patch.gz b/source.local/l/qt/qt.gcc47.patch.gz
deleted file mode 100644
index fe93acd..0000000
--- a/source.local/l/qt/qt.gcc47.patch.gz
+++ /dev/null
diff --git a/source.local/l/qt/qt.qtbug-24718.patch.gz b/source.local/l/qt/qt.qtbug-24718.patch.gz
deleted file mode 100644
index fa3ed8b..0000000
--- a/source.local/l/qt/qt.qtbug-24718.patch.gz
+++ /dev/null
diff --git a/source.local/l/qt/qt.webkit-no_Werror.patch.gz b/source.local/l/qt/qt.webkit-no_Werror.patch.gz
index c1095fe..8e3f48c 100644
--- a/source.local/l/qt/qt.webkit-no_Werror.patch.gz
+++ b/source.local/l/qt/qt.webkit-no_Werror.patch.gz
diff --git a/source.local/l/qt/qt.x86.cflags.diff.gz b/source.local/l/qt/qt.x86.cflags.diff.gz
deleted file mode 100644
index ef3b3fd..0000000
--- a/source.local/l/qt/qt.x86.cflags.diff.gz
+++ /dev/null
diff --git a/source.local/l/qt/slack-desc b/source.local/l/qt/slack-desc
index 3f77a7f..0a42d4a 100644
--- a/source.local/l/qt/slack-desc
+++ b/source.local/l/qt/slack-desc
@@ -11,9 +11,9 @@ qt:
 qt: Qt is a complete and well-developed object-oriented framework for
 qt: developing graphical user interface (GUI) applications using C++.
 qt:
+qt: Homepage:  http://qt-project.org/
 qt:
 qt:
 qt:
 qt:
-qt: Homepage:  http://qt.nokia.com
 qt:
diff --git a/source.local/l/raptor/raptor.SlackBuild b/source.local/l/raptor/raptor.SlackBuild
deleted file mode 100755
index abe9e77..0000000
--- a/source.local/l/raptor/raptor.SlackBuild
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-
-# Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
-# Copyright 2008, 2009, 2010  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.
-
-# Modified by Robby Workman <rworkman@slackware.com>
-# No added terms or copyright claims
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
-PKGNAM=raptor
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-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
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
- -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 \
-  --disable-static \
-  --build=$TARGET
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* INSTALL* LICENSE* NEWS* \
-  NOTICE README* RELEASE.html \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION
-  ln -s /usr/share/gtk-doc/html/raptor html
-)
-
-# 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
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source.local/l/raptor/raptor.info b/source.local/l/raptor/raptor.info
deleted file mode 100644
index 0f2bae3..0000000
--- a/source.local/l/raptor/raptor.info
+++ /dev/null
@@ -1,2 +0,0 @@
-HOMEPAGE="http://librdf.org/"
-DOWNLOAD="http://download.librdf.org/source/raptor-1.4.18.tar.gz"
diff --git a/source.local/l/raptor/slack-desc b/source.local/l/raptor/slack-desc
deleted file mode 100644
index e15154b..0000000
--- a/source.local/l/raptor/slack-desc
+++ /dev/null
@@ -1,12 +0,0 @@
-      |-----handy-ruler------------------------------------------------------|
-raptor: raptor (RDF Parser & Serializer)
-raptor:
-raptor: Raptor is a free software/Open Source C library that provides a set of
-raptor: parsers and serializers that generate Resource Description Framework
-raptor: (RDF) triples by parsing syntaxes or serialize the triples into a
-raptor: syntax.  The supported parsing syntaxes are RDF/XML, N-Triples, TRiG,
-raptor: Turtle, RSS tag soup including all versions of RSS, Atom 1.0 and 0.3,
-raptor: GRDDL and microformats for HTML, XHTML and XML.
-raptor:
-raptor: Homepage:  http://librdf.org/
-raptor:
diff --git a/source.local/l/raptor2/raptor2.SlackBuild b/source.local/l/raptor2/raptor2.SlackBuild
new file mode 100755
index 0000000..6824e87
--- /dev/null
+++ b/source.local/l/raptor2/raptor2.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/sh
+
+# Copyright 2007, 2012, 2013  Heinz Wiesinger, Amsterdam, NL
+# 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
+# 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.
+
+# Modified by Robby Workman <rworkman@slackware.com>
+# Modified by Eric Hameleers <alien@slackware.com>
+# No added terms or copyright claims
+
+
+PKGNAM=raptor2
+VERSION=${VERSION:-2.0.9}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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 \
+  --disable-static \
+  --with-icu-config=/usr/bin/icu-config \
+  --build=$TARGET
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL* LICENSE* NEWS* \
+  NOTICE README* RELEASE.html UPGRADING* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+( cd $PKG/usr/doc/$PKGNAM-$VERSION
+  ln -s /usr/share/gtk-doc/html/$PKGNAM html
+)
+
+# 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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/raptor2/slack-desc b/source.local/l/raptor2/slack-desc
new file mode 100644
index 0000000..309b74a
--- /dev/null
+++ b/source.local/l/raptor2/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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+raptor2: raptor2 (RDF Parser & Serializer)
+raptor2:
+raptor2: Raptor is a free software/Open Source C library that provides a set of
+raptor2: parsers and serializers that generate Resource Description Framework
+raptor2: (RDF) triples by parsing syntaxes or serialize the triples into a
+raptor2: syntax.  The supported parsing syntaxes are RDF/XML, N-Triples, TRiG,
+raptor2: Turtle, RSS tag soup including all versions of RSS, Atom 1.0 and 0.3,
+raptor2: GRDDL and microformats for HTML, XHTML and XML.
+raptor2:
+raptor2: Homepage:  http://librdf.org/
+raptor2:
diff --git a/source.local/l/rasqal/rasqal.SlackBuild b/source.local/l/rasqal/rasqal.SlackBuild
index f86947c..8e1730b 100755
--- a/source.local/l/rasqal/rasqal.SlackBuild
+++ b/source.local/l/rasqal/rasqal.SlackBuild
@@ -28,38 +28,39 @@
 
 
 PKGNAM=rasqal
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.9.30}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+NUMJOBS=${NUMJOBS:--j7}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
diff --git a/source.local/l/rasqal/slack-desc b/source.local/l/rasqal/slack-desc
index 46e8b19..00e549d 100644
--- a/source.local/l/rasqal/slack-desc
+++ b/source.local/l/rasqal/slack-desc
@@ -1,3 +1,10 @@
+# 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------------------------------------------------------|
 rasqal: rasqal (RDF parsing library)
 rasqal:
@@ -7,6 +14,6 @@ rasqal: constructing the queries, executing them and returning result formats.
 rasqal: It currently handles the RDF Data Query Language (RDQL) and SPARQL
 rasqal: Query language.
 rasqal:
-rasqal:
 rasqal: Homepage:  http://librdf.org/
 rasqal:
+rasqal:
diff --git a/source.local/l/redland/redland.SlackBuild b/source.local/l/redland/redland.SlackBuild
index 8c95f4f..0425e19 100755
--- a/source.local/l/redland/redland.SlackBuild
+++ b/source.local/l/redland/redland.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2007  Heinz Wiesinger <hmwiesinger@gmx.at>
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2013  Heinz Wiesinger, Amsterdam, NL
+# 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
@@ -23,43 +23,43 @@
 
 # Modified by Robby Workman <rworkman@slackware.com>
 # Modified by Eric Hameleers <alien@slackware.com>
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 # No added terms and no copyright claims
 
 
 PKGNAM=redland
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.0.16}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+NUMJOBS=${NUMJOBS:--j7}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -85,16 +85,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ "$VERSION" = "1.0.9" ]; then
-  echo "Fixing a bug in redland-1.0.9 that breaks nepomuk..."
-  for i in MYSQL POSTGRESQL SQLITE TSTORE; do
-    sed -i "s/LIBADD = @${i}_LIBS@/LIBADD = @${i}_LIBS@ librdf.la/" \
-      src/Makefile.in
-  done
-elif [ "$VERSION" = "1.0.10" ]; then
-    sed -i "s/virtuoso_la_LIBADD = @ODBC_LIBS@/virtuoso_la_LIBADD = @ODBC_LIBS@ librdf.la/" src/Makefile.in
-fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -106,12 +96,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --with-included-ltdl=no \
   --with-bdb-lib=/usr/lib${LIBDIRSUFFIX} \
+  --with-bdb-dbname=db-4.4 \
   --with-threads \
   --build=$TARGET
 
-# Prevent error "No rule to make target `-lltdl', needed by `librdf.la'"
-sed -i -e 's# -lltdl$# #' -e '/^LIBS =/s# = # = -lltdl #' src/Makefile
-
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
diff --git a/source.local/l/redland/slack-desc b/source.local/l/redland/slack-desc
index db03590..f16c1d4 100644
--- a/source.local/l/redland/slack-desc
+++ b/source.local/l/redland/slack-desc
@@ -1,3 +1,10 @@
+# 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----------------------------------------------------|
 redland: redland (RDF high-level interface library)
 redland:
diff --git a/source.local/l/sg3_utils/sg3_utils.SlackBuild b/source.local/l/sg3_utils/sg3_utils.SlackBuild
new file mode 100755
index 0000000..7b16b0b
--- /dev/null
+++ b/source.local/l/sg3_utils/sg3_utils.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for sg3_utils
+
+# Copyright 2010  Robby Workman  Northport, AL, USA
+# Copyright 2010, 2011, 2012  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=sg3_utils
+VERSION=${VERSION:-1.35}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -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/$PKGNAM-$VERSION \
+  --build=$TARGET
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS BSD_LICENSE COPYING COVERAGE CREDITS ChangeLog NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/sg3_utils/sg3_utils.info b/source.local/l/sg3_utils/sg3_utils.info
new file mode 100644
index 0000000..f429377
--- /dev/null
+++ b/source.local/l/sg3_utils/sg3_utils.info
@@ -0,0 +1 @@
+http://sg.danny.cz/sg/p/
diff --git a/source.local/l/sg3_utils/slack-desc b/source.local/l/sg3_utils/slack-desc
new file mode 100644
index 0000000..b086caf
--- /dev/null
+++ b/source.local/l/sg3_utils/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 ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+sg3_utils: sg3_utils (utilities and test programs for the linux sg driver)
+sg3_utils:
+sg3_utils: This package contains low level utilities for devices that use a SCSI
+sg3_utils: command set. Apart from SCSI parallel interface (SPI) devices, the 
+sg3_utils: SCSI command set is used by ATAPI devices (CD/DVDs and tapes), USB 
+sg3_utils: mass storage devices, Fibre Channel disks, IEEE 1394 storage devices
+sg3_utils: (that use the "SBP" protocol), SAS, iSCSI and FCoE devices (among 
+sg3_utils: others).
+sg3_utils:
+sg3_utils: Homepage: http://sg.danny.cz/sg/sg3_utils.html
+sg3_utils:
diff --git a/source.local/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild b/source.local/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild
index fdec8d9..db3b249 100755
--- a/source.local/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild
+++ b/source.local/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,41 +20,43 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=shared-desktop-ontologies
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.10.0}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+NUMJOBS=${NUMJOBS:--j7}
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
diff --git a/source.local/l/shared-desktop-ontologies/slack-desc b/source.local/l/shared-desktop-ontologies/slack-desc
index 8057846..70ccf7f 100644
--- a/source.local/l/shared-desktop-ontologies/slack-desc
+++ b/source.local/l/shared-desktop-ontologies/slack-desc
@@ -13,7 +13,7 @@ shared-desktop-ontologies: the desktop in terms of vocabulary. It contains the w
 shared-desktop-ontologies: ontologies such as RDF and RDFS as well as the Nepomuk ontologies
 shared-desktop-ontologies: which are used by projects like KDE or Strigi.
 shared-desktop-ontologies:
+shared-desktop-ontologies: Homepage:  http://sourceforge.net/projects/oscaf
 shared-desktop-ontologies:
 shared-desktop-ontologies:
-shared-desktop-ontologies: Homepage: http://oscaf.sourceforge.net
 shared-desktop-ontologies:
diff --git a/source.local/l/shared-mime-info/doinst.sh.gz b/source.local/l/shared-mime-info/doinst.sh.gz
index 6e89d4b..e86e77a 100644
--- a/source.local/l/shared-mime-info/doinst.sh.gz
+++ b/source.local/l/shared-mime-info/doinst.sh.gz
diff --git a/source.local/l/shared-mime-info/shared-mime-info.SlackBuild b/source.local/l/shared-mime-info/shared-mime-info.SlackBuild
index 50f58e6..f3180c5 100755
--- a/source.local/l/shared-mime-info/shared-mime-info.SlackBuild
+++ b/source.local/l/shared-mime-info/shared-mime-info.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=shared-mime-info
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -87,10 +88,10 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/${PKGNAM}-$VERSION \
   --disable-update-mimedb \
-  --build=$TARGET
+  --build=$TARGET || exit 1
 
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
 mv $PKG/usr/share/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}
@@ -105,10 +106,20 @@ chmod 755 $PKG/var/log/setup/setup.07.update-mime-database
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
diff --git a/source.local/l/sip/sip.SlackBuild b/source.local/l/sip/sip.SlackBuild
new file mode 100755
index 0000000..b415c80
--- /dev/null
+++ b/source.local/l/sip/sip.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Copyright 2008  Aleksandar Samardzic <asamardzic@gmail.com>
+# Copyright 2008, 2009, 2010, 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.
+
+# Modified by Robby Workman <rworkman@slackware.com>
+# Modified by Eric Hameleers <alien@slackware.com>
+
+
+PKGNAM=sip
+VERSION=${VERSION:-4.14.2}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
+PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' )
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+python configure.py \
+  -b "/usr/bin" \
+  -d "$PYTHONLIB" \
+  -e "/usr/include/python$PYTHONVER" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS"
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  LICENSE COPYING* NEWS README TODO doc/* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+chown -R root:root $PKG/usr/doc
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/sip/sip.info b/source.local/l/sip/sip.info
new file mode 100644
index 0000000..034776a
--- /dev/null
+++ b/source.local/l/sip/sip.info
@@ -0,0 +1,2 @@
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/"
+DOWNLOAD="http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.8.2.tar.gz"
diff --git a/source.local/l/sip/slack-desc b/source.local/l/sip/slack-desc
new file mode 100644
index 0000000..d2fae24
--- /dev/null
+++ b/source.local/l/sip/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 ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+sip: SIP (a tool for generating Python bindings)
+sip:
+sip: SIP is a tool that makes it very easy to create Python bindings for
+sip: C and C++ libraries.  It was originally developed to create PyQt,
+sip: the Python bindings for the Qt toolkit, but can be used to create
+sip: bindings for any C or C++ library.
+sip:
+sip: Homepage:  http://www.riverbankcomputing.co.uk/software/sip/
+sip:
+sip:
+sip:
diff --git a/source.local/l/soprano/slack-desc b/source.local/l/soprano/slack-desc
new file mode 100644
index 0000000..44327e0
--- /dev/null
+++ b/source.local/l/soprano/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 ':'.
+
+       |-----handy-ruler-----------------------------------------------------|
+soprano: soprano (C++/Qt4 framework for RDF data)
+soprano:
+soprano: Soprano (formally known as QRDF) is a library which provides 
+soprano: a nice Qt interface to RDF storage solutions.  It has a modular
+soprano: structure which allows to replace the actual RDF storage 
+soprano: implementation used. 
+soprano:
+soprano: Homepage:  http://soprano.sourceforge.net/
+soprano:
+soprano:
+soprano:
diff --git a/source.local/l/soprano/soprano.SlackBuild b/source.local/l/soprano/soprano.SlackBuild
new file mode 100755
index 0000000..6ef9d2f
--- /dev/null
+++ b/source.local/l/soprano/soprano.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Copyright 2007-2008 Robby Workman, Northport, Alabama, 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
+# 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=soprano
+VERSION=${VERSION:-2.9.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-soprano
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf soprano-$VERSION
+tar xvf $CWD/soprano-$VERSION.tar.bz2 || exit 1
+cd soprano-${VERSION}* || 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 {} \;
+
+mkdir -p build
+cd build
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
+  PATH=$QTDIR/bin:$PATH \
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd ..
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/soprano-$VERSION
+cp -a \
+  AUTHORS COPYING* ChangeLog INSTALL README TODO \
+  $PKG/usr/doc/soprano-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/soprano-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/sound-theme-freedesktop/slack-desc b/source.local/l/sound-theme-freedesktop/slack-desc
new file mode 100644
index 0000000..78db32b
--- /dev/null
+++ b/source.local/l/sound-theme-freedesktop/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 ':'.
+
+                       |-----handy-ruler------------------------------------------------------|
+sound-theme-freedesktop: sound-theme-freedesktop (freedesktop.org sound theme)
+sound-theme-freedesktop:
+sound-theme-freedesktop: The freedesktop.org sound theme is a basic set of sounds for
+sound-theme-freedesktop: applications to use.
+sound-theme-freedesktop:
+sound-theme-freedesktop: Homepage: http://freedesktop.org/wiki/Specifications/sound-theme-spec
+sound-theme-freedesktop:
+sound-theme-freedesktop:
+sound-theme-freedesktop:
+sound-theme-freedesktop:
+sound-theme-freedesktop:
diff --git a/source.local/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild b/source.local/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild
new file mode 100755
index 0000000..49f8454
--- /dev/null
+++ b/source.local/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Slackware build script for sound-theme-freedesktop
+
+# Copyright 2010, 2011, 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.
+
+
+PKGNAM=sound-theme-freedesktop
+VERSION=${VERSION:-0.7}
+BUILD=${BUILD:-1}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+./configure \
+  --prefix=/usr \
+  --docdir=/usr/doc/$PKGNAM-$VERSION || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/sound-theme-freedesktop/sound-theme-freedesktop.url b/source.local/l/sound-theme-freedesktop/sound-theme-freedesktop.url
new file mode 100644
index 0000000..5964491
--- /dev/null
+++ b/source.local/l/sound-theme-freedesktop/sound-theme-freedesktop.url
@@ -0,0 +1,2 @@
+http://freedesktop.org/wiki/Specifications/sound-theme-spec
+http://people.freedesktop.org/~mccann/dist/
diff --git a/source.local/l/startup-notification/startup-notification.SlackBuild b/source.local/l/startup-notification/startup-notification.SlackBuild
index 9010313..6a09b5f 100755
--- a/source.local/l/startup-notification/startup-notification.SlackBuild
+++ b/source.local/l/startup-notification/startup-notification.SlackBuild
@@ -20,41 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo startup-notification-*.tar.?z* | cut -d - -f 3 | rev | cut -f 3- -d . | rev)}
+PKGNAM=startup-notification
+VERSION=${VERSION:-0.12}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -64,14 +66,14 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-startup-notification
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf startup-notification-$VERSION
-tar xvf $CWD/startup-notification-$VERSION.tar.bz2 || exit 1
-cd startup-notification-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -94,15 +96,15 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/startup-notification-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS BUGS COPYING NEWS README \
   doc/startup-notification.txt \
-  $PKG/usr/doc/startup-notification-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/startup-notification-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source.local/l/strigi/README b/source.local/l/strigi/README
new file mode 100644
index 0000000..218e8ce
--- /dev/null
+++ b/source.local/l/strigi/README
@@ -0,0 +1,17 @@
+trueg's blog,
+http://trueg.wordpress.com/2011/09/22/about-strigi-soprano-virtuoso-clucene-and-libstreamanalyzer/
+
+recommends using a newer libstreamanalyzer (and friends) than what is currently formally released.
+
+I ran the script
+https://projects.kde.org/projects/kdesupport/strigi/strigi/repository/revisions/master/changes/createtararchive.sh
+to generate a tarball, and am hosting it at:
+
+http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2
+http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2.md5sum
+http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2.sha1sum
+
+for others' convenience.
+
+-- rex
+
diff --git a/source.local/l/strigi/slack-desc b/source.local/l/strigi/slack-desc
new file mode 100644
index 0000000..16dda7e
--- /dev/null
+++ b/source.local/l/strigi/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 ':'.
+
+      |-----handy-ruler-----------------------------------------------------|
+strigi: strigi (fast and light desktop search engine)
+strigi:
+strigi: Strigi is a fast and light desktop search engine.  It can handle a 
+strigi: large range of file formats such as emails, office documents, media
+strigi: files, and file archives.  It can index files that are embedded in 
+strigi: other files.  This means email attachments and files in zip files
+strigi: are searchable as if they were normal files on your harddisk. 
+strigi:
+strigi: Homepage:  http://strigi.sourceforge.net/
+strigi:
+strigi:
diff --git a/source.local/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz b/source.local/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz
new file mode 100644
index 0000000..e589819
--- /dev/null
+++ b/source.local/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz
diff --git a/source.local/l/strigi/strigi.SlackBuild b/source.local/l/strigi/strigi.SlackBuild
new file mode 100755
index 0000000..2dcf69b
--- /dev/null
+++ b/source.local/l/strigi/strigi.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# Copyright 2007-2008 Robby Workman, Northport, Alabama, 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
+# 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.
+
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=strigi
+VERSION=${VERSION:-0.7.7}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/strigi-fix-ftbfs-with-gcc-4.7.diff.gz | patch -p1 --verbose || 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 {} \;
+
+mkdir -p build
+cd build
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
+  PATH=$QTDIR/bin:$PATH \
+  cmake \
+    -DENABLE_INOTIFY:BOOL=ON \
+    -DENABLE_DBUS:BOOL=ON \
+    -DENABLE_EXPAT:BOOL=ON \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
+cd -
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING 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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/l/strigi/strigi.info b/source.local/l/strigi/strigi.info
new file mode 100644
index 0000000..2301f49
--- /dev/null
+++ b/source.local/l/strigi/strigi.info
@@ -0,0 +1,4 @@
+PRGNAM="strigi"
+VERSION="0.5.9"
+HOMEPAGE="http://strigi.sourceforge.net/"
+DOWNLOAD="http://downloads.sourceforge.net/strigi/strigi-0.5.9.tar.bz2"
diff --git a/source.local/l/system-config-printer/doinst.sh.gz b/source.local/l/system-config-printer/doinst.sh.gz
index 260a4e5..85810fe 100644
--- a/source.local/l/system-config-printer/doinst.sh.gz
+++ b/source.local/l/system-config-printer/doinst.sh.gz
diff --git a/source.local/l/system-config-printer/system-config-printer-1.2.7.tar.xz.sig b/source.local/l/system-config-printer/system-config-printer-1.2.7.tar.xz.sig
deleted file mode 100644
index 61d7680..0000000
--- a/source.local/l/system-config-printer/system-config-printer-1.2.7.tar.xz.sig
+++ /dev/null
diff --git a/source.local/l/system-config-printer/system-config-printer.SlackBuild b/source.local/l/system-config-printer/system-config-printer.SlackBuild
index 5a520a5..af57e49 100755
--- a/source.local/l/system-config-printer/system-config-printer.SlackBuild
+++ b/source.local/l/system-config-printer/system-config-printer.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2010  Eric Hameleers, Eindhoven, NL
-# Copyright 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -21,42 +21,45 @@
 #   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.
+# -----------------------------------------------------------------------------
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=system-config-printer
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.3.9}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
 
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+NUMJOBS=${NUMJOBS:" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -100,16 +103,20 @@ CFLAGS="$SLKCFLAGS" \
   --build=$TARGET
 
 # Build and install:
-make $NUMJOBS udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev || make || exit 1
-make install DESTDIR=$PKG udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG
+
+# Move the udev files to the usual Slackware location:
+mkdir -p $PKG/lib
+mv $PKG/etc/udev $PKG/lib/
 
 # Slackware does not use PAM.  Instead, your user must be in group 'lp'.
 sed -i -e 's/at_console="true"/group="lp"/g' \
   $PKG/etc/dbus-1/system.d/newprinternotification.conf
 
 # Don't clobber the configuration file:
-mv $PKG/etc/dbus-1/system.d/newprinternotification.conf{,.new}
-mv $PKG/etc/dbus-1/system.d/printerdriversinstaller.conf{,.new}
+mv $PKG/etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf{,.new}
+mv $PKG/etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf{,.new}
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source.local/l/urwid/urwid.SlackBuild b/source.local/l/urwid/urwid.SlackBuild
index 50b185d..12d26b5 100755
--- a/source.local/l/urwid/urwid.SlackBuild
+++ b/source.local/l/urwid/urwid.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for urwid
 
 # Copyright 2009 Andrew Psaltis <ampsaltis@gmail.com>
+# Copyright 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,22 +24,27 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by Robby Workman <rworkman@slackware.com>
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
 
 PRGNAM=urwid
-VERSION=0.9.9.1
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
 fi
 
 CWD=$(pwd)
diff --git a/source.local/l/v4l-utils/slack-desc b/source.local/l/v4l-utils/slack-desc
index 5749115..1f235d1 100644
--- a/source.local/l/v4l-utils/slack-desc
+++ b/source.local/l/v4l-utils/slack-desc
@@ -11,9 +11,9 @@ v4l-utils:
 v4l-utils: libv4l is a collection of libraries which adds a thin abstraction
 v4l-utils: layer on top of video4linux2 devices.  The purpose of this (thin)
 v4l-utils: layer is to make it easy for application writers to support a wide
-v4l-utils: variety of devices without having to write seperate code for
+v4l-utils: variety of devices without having to write separate code for
 v4l-utils: different devices in the same class.  Linux V4L2 and DVB API
 v4l-utils: utilities are also included.
 v4l-utils:
-v4l-utils: Homepage:  http://freshmeat.net/projects/libv4l
+v4l-utils: Homepage:  http://linuxtv.org
 v4l-utils:
diff --git a/source.local/l/v4l-utils/v4l-utils.SlackBuild b/source.local/l/v4l-utils/v4l-utils.SlackBuild
index 29c5d2a..c929f09 100755
--- a/source.local/l/v4l-utils/v4l-utils.SlackBuild
+++ b/source.local/l/v4l-utils/v4l-utils.SlackBuild
@@ -21,42 +21,43 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=v4l-utils
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.8.8}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
@@ -86,9 +87,9 @@ export CFLAGS="$SLKCFLAGS"
 export CPPFLAGS="$SLKCFLAGS"
 export LDFLAGS="$SLKLDFLAGS"
 make ${NUMJOBS} PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} || \
-  make PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} || \
+  make PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man || \
   exit 1
-make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG || exit 1
+make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man DESTDIR=$PKG || exit 1
 
 # System udev files should go under /lib:
 if [ -r $PKG/etc/udev/rules.d/70-infrared.rules ]; then
diff --git a/source.local/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch b/source.local/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch
deleted file mode 100644
index 6aa5e5a..0000000
--- a/source.local/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libsrc/Wi/xqf.c	3 Mar 2011 11:56:45 -0000	1.21.2.9
-+++ libsrc/Wi/xqf.c	26 Aug 2011 19:34:56 -0000	1.21.2.12
-@@ -3520,6 +3552,12 @@
-   desc = xqf_str_parser_descs + desc_idx;
-   if (DV_DB_NULL == arg_dtp)
-     return NEW_DB_NULL;
-+  /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
-+  if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
-+    {
-+      res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
-+      goto res_ready;
-+    }
-   if (DV_STRING != arg_dtp)
-     {
-       caddr_t err = NULL;
-
diff --git a/source.local/l/virtuoso-ose/virtuoso-ose.SlackBuild b/source.local/l/virtuoso-ose/virtuoso-ose.SlackBuild
index affa4ca..976b5a3 100755
--- a/source.local/l/virtuoso-ose/virtuoso-ose.SlackBuild
+++ b/source.local/l/virtuoso-ose/virtuoso-ose.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 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,42 +21,42 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=virtuoso-opensource
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-6.1.6}
 BUILD=${BUILD:-1}
-
 NUMJOBS=${NUMJOBS:--j7}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -75,10 +75,6 @@ rm -rf virtuoso-opensource-$VERSION
 tar xvf $CWD/virtuoso-opensource-$VERSION.tar.xz || exit 1
 cd virtuoso-opensource-$VERSION || exit 1
 
-# Apply a patch that fixes Unicode issue as described here:
-#   https://bugs.kde.org/show_bug.cgi?id=271664
-cat $CWD/virtuoso-opensource-6.1.3.unicode.patch | patch -p0 --verbose || exit
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source.local/l/vte/fix_meta_alt_keybinding.patch.gz b/source.local/l/vte/fix_meta_alt_keybinding.patch.gz
new file mode 100644
index 0000000..d28d9d0
--- /dev/null
+++ b/source.local/l/vte/fix_meta_alt_keybinding.patch.gz
diff --git a/source.local/l/vte/vte.SlackBuild b/source.local/l/vte/vte.SlackBuild
index f8b0f27..a036dde 100755
--- a/source.local/l/vte/vte.SlackBuild
+++ b/source.local/l/vte/vte.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=vte
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.28.2}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -82,6 +83,12 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+zcat $CWD/fix_meta_alt_keybinding.patch.gz | patch -p1 || exit 1
+
+# Escape sequences can cause high CPU usage (CVE-2012-2738):
+zcat $CWD/vte.escape.cpu.usage.diff.gz | patch -p1 || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -91,7 +98,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-static \
-  --disable-introspection \
+  --enable-introspection \
   --enable-python \
   --enable-gnome-pty-helper \
   --with-gtk=2.0 \
diff --git a/source.local/l/vte/vte.escape.cpu.usage.diff.gz b/source.local/l/vte/vte.escape.cpu.usage.diff.gz
new file mode 100644
index 0000000..5db80aa
--- /dev/null
+++ b/source.local/l/vte/vte.escape.cpu.usage.diff.gz
diff --git a/source.local/n/ModemManager/ModemManager.SlackBuild b/source.local/n/ModemManager/ModemManager.SlackBuild
new file mode 100755
index 0000000..a1a4cc5
--- /dev/null
+++ b/source.local/n/ModemManager/ModemManager.SlackBuild
@@ -0,0 +1,118 @@
+#!/bin/sh
+
+# Slackware build script for ModemManager
+
+# Copyright 2010, 2011  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.
+
+# Modified by Eric Hameleers, Eindhoven, NL
+
+PKGNAM=ModemManager
+VERSION=${VERSION:-0.6.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z*
+cd $PKGNAM-$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/$PKGNAM-$VERSION \
+  --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/2.4.5 \
+  --build=$TARGET
+
+make $NUMJOBS
+make install DESTDIR=$PKG
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+
diff --git a/source.local/n/ModemManager/slack-desc b/source.local/n/ModemManager/slack-desc
new file mode 100644
index 0000000..2455ad8
--- /dev/null
+++ b/source.local/n/ModemManager/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 ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+ModemManager: ModemManager (mobile broadband modem API)
+ModemManager:
+ModemManager: ModemManager provides a unified high level API for communicating with
+ModemManager: mobile broadband modems. 
+ModemManager:
+ModemManager:
+ModemManager:
+ModemManager:
+ModemManager: For more info, see:
+ModemManager:   http://cgit.freedesktop.org/ModemManager/ModemManager/
+ModemManager:
diff --git a/source.local/n/NetworkManager/55NetworkManager b/source.local/n/NetworkManager/55NetworkManager
new file mode 100644
index 0000000..f3c6df5
--- /dev/null
+++ b/source.local/n/NetworkManager/55NetworkManager
@@ -0,0 +1,42 @@
+#!/bin/sh
+# If we are running NetworkManager, tell it we are going to sleep.
+# TODO: Make NetworkManager smarter about how to handle sleep/resume
+#       If we are asleep for less time than it takes for TCP to reset a
+#       connection, and we are assigned the same IP on resume, we should
+#       not break established connections.  Apple can do this, and it is
+#       rather nifty.
+
+. "${PM_FUNCTIONS}"
+
+suspend_nm()
+{
+	# Tell NetworkManager to shut down networking
+        printf "Having NetworkManager put all interaces to sleep..."
+	dbus_send --system                         \
+		--dest=org.freedesktop.NetworkManager  \
+		/org/freedesktop/NetworkManager        \
+		org.freedesktop.NetworkManager.sleep && \
+	    echo Done. || echo Failed.
+}
+
+resume_nm()
+{
+	# Wake up NetworkManager and make it do a new connection
+	printf "Having NetworkManager wake interfaces back up..."
+        dbus_send --system                        \
+		--dest=org.freedesktop.NetworkManager \
+		/org/freedesktop/NetworkManager       \
+		org.freedesktop.NetworkManager.wake && \
+	    echo Done. || echo Failed.
+}
+
+case "$1" in
+	hibernate|suspend)
+		suspend_nm
+		;;
+	thaw|resume)
+		resume_nm
+		;;
+	*) exit $NA
+		;;
+esac
diff --git a/source.local/n/NetworkManager/NetworkManager.SlackBuild b/source.local/n/NetworkManager/NetworkManager.SlackBuild
new file mode 100755
index 0000000..186afe3
--- /dev/null
+++ b/source.local/n/NetworkManager/NetworkManager.SlackBuild
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+# Copyright 2010, 2011  Robby Workman, Northport, Alabama, USA
+# Copyright 2013  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.
+
+# Modified 2011, 2012  by Eric Hameleers, Eindhoven, NL
+
+PKGNAM=NetworkManager
+VERSION=${VERSION:-0.9.8.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Find the version off pppd installed or else assume we are on -current:
+PPPD=$( basename $(find /usr/lib${LIBDIRSUFFIX}/pppd -type d -maxdepth 1 -mindepth 1) )
+[ -z "$PPPD" ] && PPPD=2.4.5
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \
+  --with-crypto=nss \
+  --enable-more-warnings=no \
+  --without-resolvconf \
+  --with-dhcpcd=/sbin/dhcpcd \
+  --with-dhclient=yes \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# For some reason NetworkManager-0.9.8.0 does not install these:
+( cd man
+  mkdir -p $PKG/usr/man/man1
+  cp -a *.1 $PKG/usr/man/man1
+  mkdir -p $PKG/usr/man/man5
+  cp -a *.5 $PKG/usr/man/man5
+  mkdir -p $PKG/usr/man/man8
+  cp -a *.8 $PKG/usr/man/man8
+)
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# In case NetworkManager tries to install something here:
+rm -f $PKG/etc/rc.d/rc.networkmanager
+
+# Don't clobber existing rc.networkmanager
+# Don't run NetworkManager by default just because it got installed.
+# Instead, the init script will have to be made executable first.
+# This should avoid nasty surprises on potentially remotely located machines.
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.networkmanager > $PKG/etc/rc.d/rc.networkmanager.new
+chmod 0644 $PKG/etc/rc.d/rc.networkmanager.new
+
+# Add a 'starter' NetworkManager.conf file
+# This sets the hostname (during postinstall) to match the system's name
+# and defines dhcpcd as the dhcp client to use
+mkdir -p $PKG/etc/NetworkManager
+cat $CWD/NetworkManager.conf.new > \
+    $PKG/etc/NetworkManager/NetworkManager.conf.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+# In case someone needs this still:
+cp $CWD/55NetworkManager $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
+  cat ChangeLog | head -n 1000 > $PKG/usr/doc/$PKGNAM-$VERSION/ChangeLog
+  touch -r ChangeLog $PKG/usr/doc/$PKGNAM-$VERSION/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg --prepend -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/n/NetworkManager/NetworkManager.conf.new b/source.local/n/NetworkManager/NetworkManager.conf.new
new file mode 100644
index 0000000..71945e9
--- /dev/null
+++ b/source.local/n/NetworkManager/NetworkManager.conf.new
@@ -0,0 +1,11 @@
+# /etc/NetworkManager/NetworkManager.conf
+#
+# See NetworkManager.conf(5) for more information on this file
+
+[main]
+plugins=keyfile
+dhcp=dhcpcd
+
+[keyfile]
+hostname=yourhostname
+
diff --git a/source.local/n/NetworkManager/README b/source.local/n/NetworkManager/README
new file mode 100644
index 0000000..5556f27
--- /dev/null
+++ b/source.local/n/NetworkManager/README
@@ -0,0 +1,15 @@
+NetworkManager attempts to keep an active network connection available at all
+times.  The point of NetworkManager is to make networking configuration and
+setup as painless and automatic as possible.  NetworkManager is intended to
+replace default route, replace other routes, set IP addresses, and in general
+configure networking as NM sees fit (with the possibility of manual override as
+necessary).  In effect, the goal of NetworkManager is to make networking Just
+Work with a minimum of user hassle, but still allow customization and a high
+level of manual network control.
+
+You will probably want to install network-manager-applet (for a configuration
+UI) for sure, along with ModemManager (if you want support for configuring
+broadband modem connections) perhaps one or more of the VPN-related addons.
+
+You will also need to start rc.networkmanager during boot - you can use
+rc.local, or perhaps you'll want to edit rc.M's call to rc.wicd...  :-)
diff --git a/source.local/n/NetworkManager/doinst.sh b/source.local/n/NetworkManager/doinst.sh
new file mode 100644
index 0000000..6769a72
--- /dev/null
+++ b/source.local/n/NetworkManager/doinst.sh
@@ -0,0 +1,52 @@
+
+config() {
+  NEW="$1"
+  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
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname ${NEW})/$(basename ${NEW} .new)"
+  if [ -e ${OLD} ]; then
+    cp -a ${OLD} ${NEW}.incoming
+    cat ${NEW} > ${NEW}.incoming
+    mv ${NEW}.incoming ${NEW}
+  fi
+  mv ${NEW} ${OLD}
+}
+
+if [ -e etc/HOSTNAME ]; then
+  sed -i "s,yourhostname,$(cat etc/HOSTNAME | cut -f1 -d .)," \
+    etc/NetworkManager/NetworkManager.conf.new
+fi
+
+# Preserve permissions, but move this into place.  Otherwise the net
+# connection could be lost at a remote location.
+preserve_perms etc/rc.d/rc.networkmanager.new
+config etc/NetworkManager/NetworkManager.conf.new
+
+# Since the .pid file may have relocated, we need to check both places
+# and restart if NetworkManager is in use:
+if [ -x /etc/rc.d/rc.networkmanager ]; then
+  # Shut down any DHCP connections, otherwise the processes will be orphaned
+  # and the connections will not come up when NetworkManager restarts.
+  if ps ax | grep /sbin/dhcpcd | grep -q libexec/nm-dhcp ; then
+    ps ax | grep /sbin/dhcpcd | grep libexec/nm-dhcp | while read line ; do
+      kill -HUP $(echo $line | cut -b 1-5)
+    done
+  fi
+  killall NetworkManager 2> /dev/null
+  rm -f /var/run/NetworkManager/NetworkManager.pid
+  rm -f /var/run/NetworkManager.pid
+  sleep 5
+  sh /etc/rc.d/rc.networkmanager start
+fi
+
diff --git a/source.local/n/NetworkManager/rc.networkmanager b/source.local/n/NetworkManager/rc.networkmanager
new file mode 100644
index 0000000..8bb9140
--- /dev/null
+++ b/source.local/n/NetworkManager/rc.networkmanager
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# NetworkManager:   NetworkManager daemon
+#
+# description:  This is a daemon for automatically switching network \
+#               connections to the best available connection. \
+#
+# processname: NetworkManager
+# pidfile: /var/run/NetworkManager/NetworkManager.pid
+#
+
+prefix=/usr
+exec_prefix=/usr
+sbindir=${exec_prefix}/sbin
+
+NETWORKMANAGER_BIN=${sbindir}/NetworkManager
+
+# Sanity checks.
+[ -x $NETWORKMANAGER_BIN ] || exit 0
+
+PIDFILE=/var/run/NetworkManager/NetworkManager.pid
+
+nm_start()
+{
+  if [ "`pgrep dbus-daemon`" = "" ]; then
+    echo "D-BUS must be running to start NetworkManager"
+    return
+  fi
+  
+  # Just in case the pidfile is still there, we may need to nuke it.
+  if [ -e "$PIDFILE" ]; then
+    rm -f $PIDFILE
+  fi
+
+  echo "Starting NetworkManager daemon:  $NETWORKMANAGER_BIN"
+  $NETWORKMANAGER_BIN
+}
+
+nm_status()
+{
+  local pidlist=`cat $PIDFILE 2>/dev/null`
+  if [ -z "$pidlist" ]; then
+    return 1
+  fi
+  local command=`ps -p $pidlist -o comm=`
+  if [ "$command" != 'NetworkManager' ]; then
+    return 1
+  fi
+}
+
+nm_stop()
+{
+  echo -en "Stopping NetworkManager: "
+  # Shut down any DHCP connections, otherwise the processes will be orphaned
+  # and the connections will not come up when NetworkManager restarts.
+  if ps ax | grep /sbin/dhcpcd | grep -q libexec/nm-dhcp ; then
+    ps ax | grep /sbin/dhcpcd | grep libexec/nm-dhcp | while read line ; do
+      kill -HUP $(echo $line | cut -b 1-5)
+    done
+  fi
+  local pidlist=`cat $PIDFILE 2>/dev/null`
+  if [ ! -z "$pidlist" ]; then
+    kill $pidlist &>/dev/null
+    sleep 3
+    rm -f $PIDFILE &>/dev/null
+  fi
+  echo "stopped";
+  sleep 3
+}
+
+nm_restart()
+{
+  nm_stop
+  nm_start
+}
+
+case "$1" in
+'start')
+  if ( ! nm_status ); then
+    nm_start
+  else
+    echo "NetworkManager is already running (will not start it twice)."
+  fi
+		;;
+'stop')
+  nm_stop
+		;;
+'restart')
+  nm_restart
+		;;
+'status')
+  if ( nm_status ); then
+    echo "NetworkManager is currently running"
+  else
+    echo "NetworkManager is not running."
+  fi
+		;;
+*)
+  echo "usage $0 start|stop|status|restart"
+esac
diff --git a/source.local/n/NetworkManager/slack-desc b/source.local/n/NetworkManager/slack-desc
new file mode 100644
index 0000000..2a47aaa
--- /dev/null
+++ b/source.local/n/NetworkManager/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 ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+NetworkManager: NetworkManager (Networking that Just Works)
+NetworkManager:
+NetworkManager: The point of NetworkManager is to make networking configuration and
+NetworkManager: setup as painless and automatic as possible.  NetworkManager sets IP
+NetworkManager: addresses, default routes, associating with wireless access points
+NetworkManager: or wired LANs, and other network configuration settings in a simple,
+NetworkManager: automated fashion (manual overrides are still possible).
+NetworkManager:
+NetworkManager:
+NetworkManager: Home page: http://projects.gnome.org/NetworkManager/
+NetworkManager:
diff --git a/source.local/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign b/source.local/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign
new file mode 100644
index 0000000..42ee696
--- /dev/null
+++ b/source.local/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABAgAGBQJPkb1tAAoJEAbKn10dzyZZFUkP/A2hX9Rjeg16vDfycTRnDJy2
+jrcA2ExrKnb8uYgvCuYlY1cXb+tS5xCGQt1YlFowV9ukx9tt5C0krAIKjfeZ90tJ
+o/nD/us60t0n5sAOK230W1l8XBDuawnIN3zjznLCzntybOyl5lc9Uia5tCCd69rg
+7UOmj6Ahsk0g8GEqIQgYhddM6Q/HQNjKGKqYPzjdInORgJz+C5E/ONpbsbL8MAfG
+t/8S1CfnBuwaRCM8pUdCBLO2bj7oKHLE/vipccorMWDuXEsU1a1rilbbBlONLLFb
+pgfqjkpAdqgICS9+YkdA7e+i/Ha2B0hS1qS7x5PGApSwWXaxNDMiaksMEHkh4B6A
+b1va/nOepb+IlS67tF/SB0S7PyUyuKpBv6Ln8dpdz5gwbyJ2XGDNdmhe/4zTFjiv
+HVrvS3Ms0ULv7NRX9rXiNEK1rmJ61uVzHInMJQUcASr4ZrdYSaCZ53Ejr+bqCDWV
+DogI+ZSHOBgDSCSbY0UMhQtqxOE24vgT8IlJwQJNFMhRXpj550Jz1qbjUGNybnAI
+fNYJ8RxdoLriJUY7+MmniUvcen6vAd/yXI4sp+GF6Akt72gkCA0T0Y41vIL3sQnj
+M26O9Nn+j/GowSYATEj6QCWUCBH/BUxau+9tQfq7axiMOeiYJOAe3yciW6pP1Ysh
+ZVBKF6fOxaegTPiooruJ
+=q5pj
+-----END PGP SIGNATURE-----
diff --git a/source.local/n/bluez-hcidump/bluez-hcidump.SlackBuild b/source.local/n/bluez-hcidump/bluez-hcidump.SlackBuild
index 217cccc..e17c60a 100755
--- a/source.local/n/bluez-hcidump/bluez-hcidump.SlackBuild
+++ b/source.local/n/bluez-hcidump/bluez-hcidump.SlackBuild
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=bluez-hcidump
-VERSION=${VERSION:-2.2}
+VERSION=${VERSION:-2.4}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -88,7 +89,6 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --disable-static \
   --build=$TARGET
 
 # Build and install:
diff --git a/source.local/n/bluez/bluez-4.91.tar.sign b/source.local/n/bluez/bluez-4.91.tar.sign
deleted file mode 100644
index bb9b05b..0000000
--- a/source.local/n/bluez/bluez-4.91.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBNkiAFyGugalF9Dw4RAqa6AJ9bxkhDm2sW6JqVMT8JwSa/5eFZaQCbBuKA
-27f95iFeuRTVrhRkoFiTOto=
-=u4px
------END PGP SIGNATURE-----
diff --git a/source.local/n/bluez/bluez-4.99.tar.sign b/source.local/n/bluez/bluez-4.99.tar.sign
new file mode 100644
index 0000000..a9a039b
--- /dev/null
+++ b/source.local/n/bluez/bluez-4.99.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABAgAGBQJPVkejAAoJEAbKn10dzyZZ0rEP/1BvYxUAoYf0cP2pQIqDwzkV
+l9PSVsxKq/n3rNwKEWBufo3heHYxVAG5prlPiY8yHj4Q0tFNiCSPL+zLObG++iDy
+3x+wxmaNaqbYurXQolHOqmH1L4OeMqT3mdzlb7xN48RLHLiS0XwTUMu2VBcM00me
+nd03q+7gV6c1v3bXrDalUJuQQYHeubSLT6YMDKmMj/7PiLfA8hEoOE1uWefcBcas
+B9xi5IBY208Cdq5odL6ae8ybvvG/PTDSFAOZNCzqIjJMYEwBosh1TbPN1AvUu1z2
+bzbgAa3oaRXnGZNDJ07pwa+2A+jAAtDRNO2R6z5lovpT568nwY6bmDIvbcIHuMHj
+xhrhbUvPnhIcn+no+WkAtYjNe8ydcdH8BkeA7o1oauRAYJlGoTIVugobu2a608NN
+7bGChWnhTPaKty8p0NGuE5gFvMwwLeE3W3d50+JH6icNBZbZOYK+88q1OI9hTHSW
+fUm/tydzqRwPDuqgt6CiYxT49AuwQ+MjfED0fwvlfta8A+tYUDkgaOkpUcJvq8v/
+Bnd0mUkT7l2fiymw7hfzJEh9EXBWmXJBs77zkYPBmzv/YDSCpMWZuEHI7gvcBu4j
+BN/+pJfYwo/kPRS0nXc/Xt438H806SUdvD926MmRwmg5jYmBRVJSemYtPHfkC03L
+MO/geWyy5aH5w/+THCgN
+=BIdO
+-----END PGP SIGNATURE-----
diff --git a/source.local/n/bluez/bluez.SlackBuild b/source.local/n/bluez/bluez.SlackBuild
index 3818cbe..7000ee3 100755
--- a/source.local/n/bluez/bluez.SlackBuild
+++ b/source.local/n/bluez/bluez.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bluez - http://www.bluez.org
 
-# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,42 +22,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=bluez
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.99}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -83,16 +84,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Fixup the dbus config file for our usage:
-zcat $CWD/patches/bluez-dbus-config.patch.gz | patch -p1 --verbose || exit 1
-
-# Use a wrapper to check rc.bluetooth mode before starting bluetoothd
-zcat $CWD/patches/bluez-run_udev_helper.patch.gz | patch -p1 --verbose || exit 1
-
-# Unbreak a Dell USB mouse
-# https://bugzilla.novell.com/show_bug.cgi?id=522287
-# https://bugzilla.redhat.com/show_bug.cgi?id=517088
-zcat $CWD/patches/bluez-unbreak_dell_mouse.patch.gz | patch -p1 --verbose || exit 1
+# Enable the audio socket in audio.conf:
+zcat $CWD/bluez.enable.audio.socket.diff.gz | patch -p1 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -102,10 +95,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --localstatedir=/var \
+  --enable-datafiles \
+  --enable-audio \
   --enable-gstreamer \
   --enable-alsa \
   --enable-usb \
   --enable-tools\
+  --enable-input \
   --enable-bccmd \
   --enable-hid2hci \
   --enable-dfutool \
@@ -114,38 +110,30 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-dund \
   --enable-cups \
   --enable-service \
-  --enable-udevrules \
-  --enable-configfiles \
+  --enable-network \
+  --enable-serial \
+  --enable-health \
+  --enable-pnat \
+  --enable-maemo6 \
+  --enable-wiimote \
+  --enable-test \
+  --enable-dbusoob \
+  --with-ouifile=/usr/share/hwdata/oui.txt \
   --disable-silent-rules \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# I'm don't think we need this, but I'll leave it commented just in case:
-# http://bugs.archlinux.org/task/4930
-# The dbus-1 and bluetooth linkages are obvious, but I had to get the rt and
-# pthread ones from the old bluez-utils (VERSION=3.36) tests/Makefile
-#gcc $SLKCFLAGS $(pkg-config --cflags dbus-1) -DVERSION=3.36 \
-#  -L$(pwd)/lib/.libs -ldbus-1 -lbluetooth -lpthread -lrt \
-#  $CWD/passkey-agent.c -o $PKG/usr/bin/passkey-agent || exit 1
-
+cp scripts/bluetooth-serial.rules $PKG/lib/udev/rules.d/97-bluetooth-serial.rules || exit 1
 cp -a scripts/bluetooth_serial $PKG/lib/udev/bluetooth_serial || exit 1
 chmod 0755 $PKG/lib/udev/bluetooth_serial
 
-cat $CWD/config/bluetooth.sh > $PKG/lib/udev/bluetooth.sh
-chmod 0755 $PKG/lib/udev/bluetooth.sh
-
-# SuSE says this is safe... :-)
-mkdir -p $PKG/etc/modprobe.d
-cat $CWD/config/bluetooth.modprobe > $PKG/etc/modprobe.d/bluetooth.conf
-
 mkdir -p $PKG/etc/bluetooth
 cp -a audio/audio.conf $PKG/etc/bluetooth
 cp -a input/input.conf $PKG/etc/bluetooth
 cp -a network/network.conf $PKG/etc/bluetooth
 cp -a serial/serial.conf $PKG/etc/bluetooth
-cp -a tools/rfcomm.conf $PKG/etc/bluetooth
 chmod 644 $PKG/etc/bluetooth/*.conf
 
 mkdir -p $PKG/etc/alsa
diff --git a/source.local/n/bluez/bluez.enable.audio.socket.diff.gz b/source.local/n/bluez/bluez.enable.audio.socket.diff.gz
new file mode 100644
index 0000000..3a33ce2
--- /dev/null
+++ b/source.local/n/bluez/bluez.enable.audio.socket.diff.gz
diff --git a/source.local/n/bluez/config/bluetooth.sh b/source.local/n/bluez/config/bluetooth.sh
deleted file mode 100644
index 2203455..0000000
--- a/source.local/n/bluez/config/bluetooth.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Check whether /etc/rc.d/rc.bluetooth is executable before starting
-# the bluetooth subsystem for hotplugged bluetooth devices
-[ -x /etc/rc.d/rc.bluetooth ] && exec /usr/sbin/bluetoothd --udev
-exit 0
-
diff --git a/source.local/n/bluez/config/rc.bluetooth b/source.local/n/bluez/config/rc.bluetooth
index 12540d8..296c454 100644
--- a/source.local/n/bluez/config/rc.bluetooth
+++ b/source.local/n/bluez/config/rc.bluetooth
@@ -1,12 +1,11 @@
 #!/bin/sh
 
 bluez_start() {
-  # bluetoothd requires dbus, but dbus isn't started early enough during
-  # system boot, so we have to re-trigger the events now
-  udevadm trigger --subsystem-match=bluetooth --action=add
+  /usr/sbin/bluetoothd
 }
 
 bluez_stop() {
+  udevadm trigger --subsystem-match=bluetooth --action=remove
   pkill -TERM bluetoothd 1>/dev/null 2>/dev/null
 }
 
diff --git a/source.local/n/bluez/doinst.sh.gz b/source.local/n/bluez/doinst.sh.gz
index 654194a..ca74fc1 100644
--- a/source.local/n/bluez/doinst.sh.gz
+++ b/source.local/n/bluez/doinst.sh.gz
diff --git a/source.local/n/bluez/passkey-agent.c b/source.local/n/bluez/passkey-agent.c
deleted file mode 100644
index 8ac91d2..0000000
--- a/source.local/n/bluez/passkey-agent.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2004-2008  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <getopt.h>
-#include <string.h>
-
-#include <dbus/dbus.h>
-
-#define INTERFACE "org.bluez.Security"
-
-static char *passkey = NULL;
-static char *address = NULL;
-
-static int do_reject = 0;
-
-static volatile sig_atomic_t __io_canceled = 0;
-static volatile sig_atomic_t __io_terminated = 0;
-
-static void sig_term(int sig)
-{
-	__io_canceled = 1;
-}
-
-static DBusHandlerResult agent_filter(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	const char *name, *old, *new;
-
-	if (!dbus_message_is_signal(msg, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (!dbus_message_get_args(msg, NULL,
-			DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old,
-				DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for NameOwnerChanged signal");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	if (!strcmp(name, "org.bluez") && *new == '\0') {
-		fprintf(stderr, "Passkey service has been terminated\n");
-		__io_terminated = 1;
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static DBusHandlerResult request_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-	const char *path, *address;
-	dbus_bool_t numeric;
-
-	if (!passkey)
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (!dbus_message_get_args(msg, NULL,
-			DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &address,
-			DBUS_TYPE_BOOLEAN, &numeric, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for passkey Request method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	if (do_reject) {
-		reply = dbus_message_new_error(msg,
-					"org.bluez.Error.Rejected", "");
-		goto send;
-	}
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NEED_MEMORY;
-	}
-
-	printf("Passkey request for device %s\n", address);
-
-	dbus_message_append_args(reply, DBUS_TYPE_STRING, &passkey,
-					DBUS_TYPE_INVALID);
-
-send:
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult cancel_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-	const char *path, *address;
-
-	if (!dbus_message_get_args(msg, NULL,
-			DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &address,
-							DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for passkey Confirm method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	printf("Request canceled for device %s\n", address);
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NEED_MEMORY;
-	}
-
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult release_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-
-	if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for passkey Release method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	if (!__io_canceled)
-		fprintf(stderr, "Passkey service has been released\n");
-
-	__io_terminated = 1;
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NEED_MEMORY;
-	}
-
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult agent_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Request"))
-		return request_message(conn, msg, data);
-
-	if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Cancel"))
-		return cancel_message(conn, msg, data);
-
-	if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Release"))
-		return release_message(conn, msg, data);
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static const DBusObjectPathVTable agent_table = {
-	.message_function = agent_message,
-};
-
-static int register_agent(DBusConnection *conn, const char *agent_path,
-				const char *remote_address, int use_default)
-{
-	DBusMessage *msg, *reply;
-	DBusError err;
-	const char *path, *method, *address = remote_address;
-
-	if (!dbus_connection_register_object_path(conn, agent_path,
-							&agent_table, NULL)) {
-		fprintf(stderr, "Can't register object path for agent\n");
-		return -1;
-	}
-
-	if (use_default) {
-		path = "/org/bluez";
-		method = "RegisterDefaultPasskeyAgent";
-	} else {
-		path = "/org/bluez/hci0";
-		method = "RegisterPasskeyAgent";
-	}
-
-	msg = dbus_message_new_method_call("org.bluez", path, INTERFACE, method);
-	if (!msg) {
-		fprintf(stderr, "Can't allocate new method call\n");
-		return -1;
-	}
-
-	if (use_default)
-		dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path,
-							DBUS_TYPE_INVALID);
-	else
-		dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path,
-				DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID);
-
-	dbus_error_init(&err);
-
-	reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &err);
-
-	dbus_message_unref(msg);
-
-	if (!reply) {
-		fprintf(stderr, "Can't register passkey agent\n");
-		if (dbus_error_is_set(&err)) {
-			fprintf(stderr, "%s\n", err.message);
-			dbus_error_free(&err);
-		}
-		return -1;
-	}
-
-	dbus_message_unref(reply);
-
-	dbus_connection_flush(conn);
-
-	return 0;
-}
-
-static int unregister_agent(DBusConnection *conn, const char *agent_path,
-				const char *remote_address, int use_default)
-{
-	DBusMessage *msg, *reply;
-	DBusError err;
-	const char *path, *method, *address = remote_address;
-
-	if (use_default) {
-		path = "/org/bluez";
-		method = "UnregisterDefaultPasskeyAgent";
-	} else {
-		path = "/org/bluez/hci0";
-		method = "UnregisterPasskeyAgent";
-	}
-
-	msg = dbus_message_new_method_call("org.bluez", path, INTERFACE, method);
-	if (!msg) {
-		fprintf(stderr, "Can't allocate new method call\n");
-		dbus_connection_unref(conn);
-		exit(1);
-	}
-
-	if (use_default)
-		dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path,
-							DBUS_TYPE_INVALID);
-	else
-		dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path,
-				DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID);
-
-	dbus_error_init(&err);
-
-	reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &err);
-
-	dbus_message_unref(msg);
-
-	if (!reply) {
-		fprintf(stderr, "Can't unregister passkey agent\n");
-		if (dbus_error_is_set(&err)) {
-			fprintf(stderr, "%s\n", err.message);
-			dbus_error_free(&err);
-		}
-		return -1;
-	}
-
-	dbus_message_unref(reply);
-
-	dbus_connection_flush(conn);
-
-	dbus_connection_unregister_object_path(conn, agent_path);
-
-	return 0;
-}
-
-static void usage(void)
-{
-	printf("Bluetooth passkey agent ver %s\n\n", VERSION);
-
-	printf("Usage:\n"
-		"\tpasskey-agent [--default] [--path agent-path] <passkey> [address]\n"
-		"\n");
-}
-
-static struct option main_options[] = {
-	{ "default",	0, 0, 'd' },
-	{ "reject",	0, 0, 'r' },
-	{ "path",	1, 0, 'p' },
-	{ "help",	0, 0, 'h' },
-	{ 0, 0, 0, 0 }
-};
-
-int main(int argc, char *argv[])
-{
-	struct sigaction sa;
-	DBusConnection *conn;
-	char match_string[128], default_path[128], *agent_path = NULL;
-	int opt, use_default = 0;
-
-	snprintf(default_path, sizeof(default_path),
-				"/org/bluez/passkey_agent_%d", getpid());
-
-	while ((opt = getopt_long(argc, argv, "+dp:h", main_options, NULL)) != EOF) {
-		switch(opt) {
-		case 'd':
-			use_default = 1;
-			break;
-		case 'r':
-			do_reject = 1;
-			break;
-		case 'p':
-			if (optarg[0] != '/') {
-				fprintf(stderr, "Invalid path\n");
-				exit(1);
-			}
-			agent_path = strdup(optarg);
-			break;
-		case 'h':
-			usage();
-			exit(0);
-		default:
-			exit(1);
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-	optind = 0;
-
-	if (argc < 1) {
-		usage();
-		exit(1);
-	}
-
-	passkey = strdup(argv[0]);
-	address = (argc > 1) ? strdup(argv[1]) : NULL;
-
-	if (!use_default && !address) {
-		usage();
-		exit(1);
-	}
-
-	if (!agent_path)
-		agent_path = strdup(default_path);
-
-	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-	if (!conn) {
-		fprintf(stderr, "Can't get on system bus");
-		exit(1);
-	}
-
-	if (register_agent(conn, agent_path, address, use_default) < 0) {
-		dbus_connection_unref(conn);
-		exit(1);
-	}
-
-	if (!dbus_connection_add_filter(conn, agent_filter, NULL, NULL))
-		fprintf(stderr, "Can't add signal filter");
-
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-					DBUS_INTERFACE_DBUS, "org.bluez");
-
-	dbus_bus_add_match(conn, match_string, NULL);
-
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_flags   = SA_NOCLDSTOP;
-	sa.sa_handler = sig_term;
-	sigaction(SIGTERM, &sa, NULL);
-	sigaction(SIGINT,  &sa, NULL);
-
-	while (!__io_canceled && !__io_terminated) {
-		if (dbus_connection_read_write_dispatch(conn, 500) != TRUE)
-			break;
-	}
-
-	if (!__io_terminated)
-		unregister_agent(conn, agent_path, address, use_default);
-
-	if (passkey)
-		free(passkey);
-
-	dbus_connection_unref(conn);
-
-	return 0;
-}
diff --git a/source.local/n/bluez/patches/bluez-dbus-config.patch.gz b/source.local/n/bluez/patches/bluez-dbus-config.patch.gz
deleted file mode 100644
index 422157d..0000000
--- a/source.local/n/bluez/patches/bluez-dbus-config.patch.gz
+++ /dev/null
diff --git a/source.local/n/bluez/patches/bluez-run_udev_helper.patch.gz b/source.local/n/bluez/patches/bluez-run_udev_helper.patch.gz
deleted file mode 100644
index 63c9073..0000000
--- a/source.local/n/bluez/patches/bluez-run_udev_helper.patch.gz
+++ /dev/null
diff --git a/source.local/n/bluez/patches/bluez-unbreak_dell_mouse.patch.gz b/source.local/n/bluez/patches/bluez-unbreak_dell_mouse.patch.gz
deleted file mode 100644
index c6b3872..0000000
--- a/source.local/n/bluez/patches/bluez-unbreak_dell_mouse.patch.gz
+++ /dev/null
diff --git a/source.local/n/cifs-utils/cifs-utils.SlackBuild b/source.local/n/cifs-utils/cifs-utils.SlackBuild
new file mode 100755
index 0000000..4f4806c
--- /dev/null
+++ b/source.local/n/cifs-utils/cifs-utils.SlackBuild
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=cifs-utils
+VERSION=${VERSION:-5.5}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+zcat $CWD/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch.gz | patch -p1 --verbose || 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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --build=$TARGET
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  doc/linux-cifs-client-guide.odt \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch.gz b/source.local/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch.gz
new file mode 100644
index 0000000..526c151
--- /dev/null
+++ b/source.local/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch.gz
diff --git a/source.local/n/cifs-utils/slack-desc b/source.local/n/cifs-utils/slack-desc
new file mode 100644
index 0000000..ff9ba3e
--- /dev/null
+++ b/source.local/n/cifs-utils/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 ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+cifs-utils: cifs-utils (CIFS filesystem utilities)
+cifs-utils:
+cifs-utils: This is the release version of cifs-utils, a package of utilities for
+cifs-utils: doing and managing mounts of the Linux CIFS filesystem.  The in-kernel
+cifs-utils: CIFS filesystem is generally the preferred method for mounting
+cifs-utils: SMB/CIFS shares on Linux.  This filesystem relies on a set of
+cifs-utils: user-space tools that were originally part of Samba, but have now been
+cifs-utils: split off into this separate package.
+cifs-utils:
+cifs-utils: Home page:  http://wiki.samba.org/index.php/LinuxCIFS_utils
+cifs-utils:
diff --git a/source.local/n/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch.gz b/source.local/n/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch.gz
new file mode 100644
index 0000000..86750f1
--- /dev/null
+++ b/source.local/n/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch.gz
diff --git a/source.local/n/curl/cacert.pem.bz2 b/source.local/n/curl/cacert.pem.bz2
index 52324d6..51d93ce 100644
--- a/source.local/n/curl/cacert.pem.bz2
+++ b/source.local/n/curl/cacert.pem.bz2
diff --git a/source.local/n/curl/curl-7.27.0_curl-config_syntax_fix.diff.gz b/source.local/n/curl/curl-7.27.0_curl-config_syntax_fix.diff.gz
deleted file mode 100644
index e9a7587..0000000
--- a/source.local/n/curl/curl-7.27.0_curl-config_syntax_fix.diff.gz
+++ /dev/null
diff --git a/source.local/n/curl/curl-7.29.0.tar.bz2.asc b/source.local/n/curl/curl-7.29.0.tar.bz2.asc
new file mode 100644
index 0000000..bf43659
--- /dev/null
+++ b/source.local/n/curl/curl-7.29.0.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEABECAAYFAlESLQQACgkQeOEcayedXJGgQgCfe/bPa09KaW9LJjrgiVu2Ou8d
+Wr4AnjtaaHu+NyO/BWLl/WlhvbYYgQjy
+=XEdz
+-----END PGP SIGNATURE-----
diff --git a/source.local/n/curl/curl.SlackBuild b/source.local/n/curl/curl.SlackBuild
index 7fb9b5f..00cef05 100755
--- a/source.local/n/curl/curl.SlackBuild
+++ b/source.local/n/curl/curl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 
 PKGNAM=curl
-VERSION=${VERSION:-$(echo curl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-7.29.0}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ -e $CWD/machine.conf ]; then
@@ -69,10 +69,10 @@ rm -rf $PKG
 mkdir -p $PKG
 cd $TMP
 rm -rf curl-$VERSION
-tar xvf $CWD/curl-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/curl-$VERSION.tar.bz2 || exit 1
 cd curl-$VERSION
 
-zcat $CWD/curl-7.27.0_curl-config_syntax_fix.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch.gz | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source.local/n/iftop/iftop.SlackBuild b/source.local/n/iftop/iftop.SlackBuild
new file mode 100755
index 0000000..724c343
--- /dev/null
+++ b/source.local/n/iftop/iftop.SlackBuild
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# Copyright 2012  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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=iftop
+VERSION=${VERSION:-1.0pre2}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION
+
+# Make sure ownerships and permissions are sane:
+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=$TARGET
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# 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
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING* 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/n/iftop/slack-desc b/source.local/n/iftop/slack-desc
new file mode 100644
index 0000000..f7bc5c4
--- /dev/null
+++ b/source.local/n/iftop/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 ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+iftop: iftop (Display bandwidth usage on an interface)
+iftop:
+iftop: iftop does for network usage what top(1) does for CPU usage.
+iftop: It listens to network traffic on a named interface and displays a
+iftop: table of current bandwidth usage by pairs of hosts.  Handy for
+iftop: answering the question "why is our link so slow?".
+iftop:
+iftop:
+iftop:
+iftop: Homepage:  http://www.ex-parrot.com/~pdw/iftop/
+iftop:
diff --git a/source.local/n/mobile-broadband-provider-info/README b/source.local/n/mobile-broadband-provider-info/README
new file mode 100644
index 0000000..0edda74
--- /dev/null
+++ b/source.local/n/mobile-broadband-provider-info/README
@@ -0,0 +1,2 @@
+This package contains mobile broadband settings for different service 
+providers in different countries.
diff --git a/source.local/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild b/source.local/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild
new file mode 100755
index 0000000..648c838
--- /dev/null
+++ b/source.local/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# Slackware build script for mobile-broadband-provider-info
+
+# Copyright 2010, 2011  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.
+
+# Modified 2011, 2012  by Eric Hameleers, Eindhoven, NL
+
+PKGNAM=mobile-broadband-provider-info
+VERSION=${VERSION:-20120614}
+BUILD=${BUILD:-1}
+TAG=${TAG:-}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z*
+cd $PKGNAM-$VERSION
+
+# Fix missing @ in .pc file:
+zcat $CWD/mobile-broadband-provider-info.pc.diff.gz | patch -p1 --verbose || 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 {} \;
+
+[ ! -x configure ] && ./autogen.sh
+
+sed -i -e \
+  's#pkgconfigdir = $(datadir)/pkgconfig#pkgconfigdir = $(libdir)/pkgconfig#' \
+  Makefile.in
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --build=$TARGET
+
+make
+make install DESTDIR=$PKG
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  COPYING ChangeLog NEWS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+
diff --git a/source.local/n/mobile-broadband-provider-info/mobile-broadband-provider-info.pc.diff.gz b/source.local/n/mobile-broadband-provider-info/mobile-broadband-provider-info.pc.diff.gz
new file mode 100644
index 0000000..f507193
--- /dev/null
+++ b/source.local/n/mobile-broadband-provider-info/mobile-broadband-provider-info.pc.diff.gz
diff --git a/source.local/n/mobile-broadband-provider-info/slack-desc b/source.local/n/mobile-broadband-provider-info/slack-desc
new file mode 100644
index 0000000..100517f
--- /dev/null
+++ b/source.local/n/mobile-broadband-provider-info/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 ':'.
+
+                              |-----handy-ruler------------------------------------------------------|
+mobile-broadband-provider-info: mobile-broadband-provider-info (service provider settings)
+mobile-broadband-provider-info:
+mobile-broadband-provider-info: This package contains mobile broadband settings for service providers
+mobile-broadband-provider-info: in various countries.
+mobile-broadband-provider-info:
+mobile-broadband-provider-info:
+mobile-broadband-provider-info:
+mobile-broadband-provider-info: For more info, see:
+mobile-broadband-provider-info:
+mobile-broadband-provider-info: http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders
+mobile-broadband-provider-info:
diff --git a/source.local/n/samba/samba.SlackBuild b/source.local/n/samba/samba.SlackBuild
index 895fafa..016f6aa 100755
--- a/source.local/n/samba/samba.SlackBuild
+++ b/source.local/n/samba/samba.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,39 +20,40 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=${VERSION:-$(echo samba-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-3.6.8}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -114,8 +115,6 @@ CFLAGS="$SLKCFLAGS" \
   --enable-shared=yes \
   --with-acl-support=yes \
   --with-automount \
-  --with-cifsmount \
-  --with-cifsumount \
   --with-quotas \
   --with-syslog \
   --with-utmp \
@@ -150,37 +149,13 @@ cp -a ../nsswitch/libnss_wins.so $PKG/lib${LIBDIRSUFFIX}/libnss_wins.so.2
   ln -sf libnss_wins.so.2 libnss_wins.so
 )
 
-# Install a pkgconfig file for libtalloc:
+# Install pkgconfig files:
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+cp -a pkgconfig/*.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
 if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc ]; then
   cat $CWD/talloc.pc | sed -e "s/\/lib/\/lib${LIBDIRSUFFIX}/" > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc
 fi
 
-## Make sure that other programs can link against libsmbclient:
-#( cd $PKG/usr/lib${LIBDIRSUFFIX}
-#  for FILE in samba/libsmbclient.so* ; do
-#    ln -sf $FILE
-#  done
-#)
-
-# Add some (u)mount links:
-mkdir -p $PKG/sbin
-( cd $PKG/sbin
-  # SMBFS is obsolete in the kernel now -- use mount.cifs
-  #rm -f mount.smbfs ; ln -sf /usr/bin/smbmount mount.smbfs
-  # Add a wrapper script from Debian that's included in the upstream Samba
-  # sources to help out people (like me ;-) who don't read every speck of
-  # documentation:
-  cat $TMP/samba-$VERSION/examples/scripts/mount/mount.smbfs > mount.smbfs
-  chmod 755 $PKG/sbin/mount.smbfs
-  # I suppose this wouldn't be the worst idea in the world, either:
-  ( cd $PKG/usr/bin ; ln -sf /sbin/mount.smbfs smbmount )
-  rm -f mount.cifs ; ln -sf /usr/sbin/mount.cifs mount.cifs
-  # smbumount was giving me problems so it seems wise to play it safe
-  #rm -f umount.smbfs ; ln -sf /usr/bin/smbumount umount.smbfs
-  #rm -f umount.cifs ; ln -sf /usr/sbin/umount.cifs umount.cifs
-)
-
 # Add a sample config file:
 cat $CWD/smb.conf.default > $PKG/etc/samba/smb.conf-sample
 
diff --git a/source.local/n/samba/slack-desc b/source.local/n/samba/slack-desc
index c06b485..f4352c6 100644
--- a/source.local/n/samba/slack-desc
+++ b/source.local/n/samba/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-samba: samba (SMB/CIFS file and print server)
+samba: samba (CIFS file and print server)
 samba:
-samba: Samba is an SMB/CIFS file and print server for SMB and CIFS clients.
-samba: It allows you to make file space or printers on a Samba host
-samba: available to SMB/CIFS clients (such as PCs running Windows).
+samba: Samba is a CIFS file and print server for CIFS clients.  It allows
+samba: you to make file space or printers on a Samba host available to CIFS
+samba: clients (such as PCs running Windows).
 samba:
 samba: If you have any Windows file servers, you may be able to replace them
 samba: or supplement them with Samba.  One of Samba's big strengths is
diff --git a/source.local/n/wireless-tools/scripts/rc.wireless b/source.local/n/wireless-tools/scripts/rc.wireless
index 5d5c4be..51623d5 100644
--- a/source.local/n/wireless-tools/scripts/rc.wireless
+++ b/source.local/n/wireless-tools/scripts/rc.wireless
@@ -53,6 +53,11 @@
 #                                if a network device is wireless.  In newer
 #                                kernels devices will not show up in
 #                                /proc/net/wireless until active.
+# 16/aug/2012 * Pat Volkerding * Use several tests to determine if an interface
+#                                is wireless, as the reliability of any given
+#                                test may depend on the kernel options and the
+#                                wireless driver used.
+#                                Convert the MAC address to uppercase in sed.
 # ------------------------------------------------------------------------------
 
 LOGGER=${LOGGER:-cat}
@@ -83,16 +88,15 @@ IFCOMMAND="/sbin/ifconfig ${INTERFACE}"
 
 is_wireless_device ()
 {
-    #[ -x $IWPATH/iwconfig ] || return 1
-    #LC_ALL=C $IWPATH/iwconfig $1 2>&1 | \
-    #    grep -Eiq "no wireless extensions|no such device" || return 0
-    #return 1
-    if [ ! -d /sys/class/net/${1}/wireless ]; then
-      # no wireless interface
-      return 1
-    else
-      # interface has wireless extensions
-      return 0
+    # Return 0 for a wireless interface, or 1 for a non-wireless interface.
+    if LC_ALL=C $IWPATH/iwconfig $1 2>&1 | grep -q "IEEE 802.11" ; then
+        return 0
+    elif [ -d /sys/class/net/${1}/wireless ]; then
+        return 0
+    elif [ "$(cat /sys/class/net/${1}/uevent | grep DEVTYPE)" = "DEVTYPE=wlan" ]; then 
+        return 0
+    else # all tests failed, assume the device is not wireless (or add a better test :)
+        return 1
     fi
 }
 
@@ -106,7 +110,7 @@ is_wireless_device ${INTERFACE} || return 0 2> /dev/null || exit 0
 # If we stop a wireless interface using wpa_supplicant,
 # we'll kill its wpa_supplicant daemon too and exit this script:
 if [ "$2" = "stop" ]; then
-	WPAPID=`echo \`ps axww|grep wpa_supplicant |grep i${INTERFACE}\` |cut -f1 -d' '`
+	WPAPID=$(echo $(ps axww | grep wpa_supplicant | grep i${INTERFACE}) | cut -f1 -d' ')
 	[ ${WPAPID} ] &&  kill ${WPAPID}
 	return 0
 fi
@@ -120,7 +124,7 @@ $IFCOMMAND up
 sleep 3
 
 # Get the MAC address for the interface
-HWADDR=`/sbin/ifconfig ${INTERFACE} | sed -ne 's/.*\(..:..:..:..:..:..\).*/\1/p' | tr [a-f] [A-F]`
+HWADDR=$(/sbin/ifconfig ${INTERFACE} | sed -ne 's/.*\(..:..:..:..:..:..\).*/\U\1/p')
 
 # Empty all wireless parameters- some of them could still be set for a previous interface:
 # when rc.inet1 is sourced from rc.M all scripts are run in the same shell.
@@ -193,7 +197,7 @@ if [ -n "$MODE" ] ; then
 fi
 # This is a bit hackish, but should do the job right...
 if [ ! -n "$NICKNAME" ] ; then
-    NICKNAME=`/bin/hostname`
+    NICKNAME=$(/bin/hostname)
 fi
 if [ -n "$ESSID" -o -n "$MODE" ] ; then
 	echo "$0:  $IWCOMMAND nick $NICKNAME" | $LOGGER
@@ -290,7 +294,7 @@ if [ "$WPA" = "wpa_supplicant" ] || [ "$WPA" = "wpaxsupplicant" ] && [ -x ${SUPP
 	[ ${WPA} = "wpaxsupplicant" ] && WPA_OPTIONS="${WPA_OPTIONS} -e" # Use external xsupplicant (disables the internal supplicant)
 
 	# We leave a running wpa_supplicant process in peace:
-	WPAPID=`echo \`ps axww|grep wpa_supplicant |grep i${INTERFACE}\` |cut -f1 -d' '`
+	WPAPID=$(echo $(ps axww | grep wpa_supplicant | grep i${INTERFACE}) | cut -f1 -d' ')
 	if [ ${WPAPID} ]; then
 	  echo "$0:  wpa_supplicant found running already" | $LOGGER
 	else
@@ -307,9 +311,9 @@ if [ "$WPA" = "wpa_supplicant" ] || [ "$WPA" = "wpaxsupplicant" ] && [ -x ${SUPP
 	while [ $wi -lt $WPAWAIT ]; do
 	  wi=$(($wi+1)); sleep 1
 	  if (grep -q "^ctrl_interface=" ${WPACONF}); then
-	    if (LC_ALL=C ${SUPPATH}/wpa_cli -i$INTERFACE status|grep -q "^wpa_state=COMPLETED"); then break; fi
+	    if (LC_ALL=C ${SUPPATH}/wpa_cli -i$INTERFACE status | grep -q "^wpa_state=COMPLETED"); then break; fi
 	  else
-	    if (LC_ALL=C ${IWCOMMAND}|grep -Eq "Encryption key:....-"); then break; fi
+	    if (LC_ALL=C ${IWCOMMAND} | grep -Eq "Encryption key:....-"); then break; fi
 	  fi
 	done
 	if [ $wi -eq $WPAWAIT ]; then
diff --git a/source.local/n/wireless-tools/wireless-tools.SlackBuild b/source.local/n/wireless-tools/wireless-tools.SlackBuild
new file mode 120000
index 0000000..a95d647
--- /dev/null
+++ b/source.local/n/wireless-tools/wireless-tools.SlackBuild
@@ -0,0 +1 @@
+wireless_tools.SlackBuild
\ No newline at end of file
diff --git a/source.local/n/wireless-tools/wireless_tools.SlackBuild b/source.local/n/wireless-tools/wireless_tools.SlackBuild
index edd80e2..8606199 100755
--- a/source.local/n/wireless-tools/wireless_tools.SlackBuild
+++ b/source.local/n/wireless-tools/wireless_tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,28 +20,32 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 VERSION=29
-BUILD=${BUILD:-6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
+BUILD=${BUILD:-9}
 
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "x86_64" ]; then
+    LIBDIRSUFFIX="64"
+  else
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
diff --git a/source.local/pasture/openjdk/README.txt b/source.local/pasture/openjdk/README.txt
new file mode 100644
index 0000000..dff6308
--- /dev/null
+++ b/source.local/pasture/openjdk/README.txt
@@ -0,0 +1,108 @@
+Creating an OpenJDK (and OpenJRE) package for Slackware
+=======================================================
+
+In this directory you will find everything I used to create packages
+for OpenJDK's JRE and JDK as an alternative to Oracle's binary-only releases
+of Java.  Oracle no longer allows these binaries to be included with OS
+distributions, so Slackware will no longer provide updates for them.
+Build instructions for OpenJDK are provided further down in this README.
+
+Or, you can just install my pre-compiled packages which I *also* provide!
+
+If you want to install and just use my pre-built packages, then all you
+really need are "rhino" which is the JavaScript engine, "icedtea-web"
+which is the browser plugin, and one of "openjdk" or "openjre" packages,
+depending of course on whether you need the full Java compiler suite or
+only the Java Runtime Environment.
+
+You will also need packages for apache-ant, xalan, xerces if you want to
+compile OpenJDK yourself.
+
+
+Compiling OpenJDK from source
+=============================
+
+Compiling OpenJDK can be done in two ways.  The first way is called
+"bootstrapping", which means compiling OpenJDK when there is no version of
+the OpenJDK installed yet.  The SlackBuild uses the gcc java compiler for this
+bootstrap (which means you have to have the "gcc-java" package installed).
+The second way is to compile OpenJDK using an already installed version of
+OpenJDK.  Such a pre-installed OpenJDK must have the same version (meaning,
+OpenJDK 7 can only be compiled by another OpenJDK 7) and must have been
+created with the help of "IcedTea" like my own openjdk,SlackBuild does.
+
+The variable "BOOTSTRAP" inside the openjdk.SlackBuild determines which java
+compiler will be used to compile OpenJDK.  If you want to use gcc's java, then
+the command will be:
+
+  # BOOTSTRAP=YES ./openjdk.SlackBuild
+
+If you already have OpenJDK installed then you would start the compilation with:
+
+  # BOOTSTRAP=NO ./openjdk.SlackBuild
+
+By default, the variable in the script is set to "NO" which means that if
+you run the openjdk.SlackBuild script without any parameters, it will use
+a pre-esisting OpenJDK to compile the new package.
+
+This SlackBuild script creates _two_ packages, the "openjdk" and the "openjre".
+If you only need a Java Runtime then all you should install is the openjre
+package - it is much smaller than the openjdk package.  The "openjdk" package
+contains the Java compiler and SDK.
+
+
+Java Web Plugin for OpenJDK
+===========================
+
+Suns's binary distribution of Java (taken over by Oracle) contains a Java web
+plugin for mozilla-compatible browsers.  This plugin was not open sourced,
+so OpenJDK needs a different solution in order to provide a web plugin for Java.
+To this purpose, you have to (build and) install the "icedtea-web" package.
+First compile and install OpenJDK (you need the openjdk package for this, not
+the JRE), then compile icedtea-web.  The SlackBuild script plus sources are
+in a separate directory.  Note that the icedtea-web plugin is not as mature
+as the plugin which is shipped with Oracle's binaries.
+
+
+Build-time requirements for OpenJDK and icedtea-web
+===================================================
+
+A word of caution.  All stable Slackware versions including "13.37" are
+not able to compile OpenJDK "out of the box". You have to enhance two core
+packages: "gcc" and "seamonkey" so that they become capable of compiling
+OpenJDK.  Use the following instructions to fix-up gcc and seamonkey.
+Either alternative is OK but running the shell scripts (the "b" options)
+is a *lot* faster than recompiling these big packages.  These core Slackware
+packages have be fixed in slackware-current.
+
+1) Choose one of these two alternatives for gcc:
+   a) rebuild gcc with "--enable-java-home".  You can use the gcc.SlackBuild
+      of Slackware-current which was modified accordingly.
+   b) or run the script "create_gcj_jvm.sh" to achieve the same result you
+      would get by rebuilding gcc: which is to create a directory structure
+      of symlinks, which emulates the presence of a Sun JDK but for the
+      GCC Java compiler.
+2) Choose one of these two alternatives for seamonkey:
+   a) rebuild seamonkey using the seamonkey.SlackBuild of Slackware-current
+      which was modified accordingly.
+   b) or run the script "fix_seamonkey_pkgconfig.sh" which does two things:
+      add a pkgconfig file "libxul.pc" and modify an existing pkgconfig
+      file, "seamonkey-plugin.pc"
+
+Furthermore, you will need to have the following Apache Ant related packages
+installed before starting the compilation of OpenJDK.
+* apache-ant
+* rhino
+* xalan
+* xerces
+
+Please note that after installing apache-ant you will have to logout and
+login again to initialize the ANT_HOME environment variable.
+
+Only the "rhino" package has to remain on your system in order to *run* OpenJDK.
+The other three (apache-ant, xalan and xerces) are only needed during the
+compilation and can optionally be removed afterwards (but why should you).
+
+
+==============================================================================
+Eric Hameleers <alien at slackware.com>, 25-feb-2012
diff --git a/source.local/pasture/openjdk/create_gcj_jvm.sh b/source.local/pasture/openjdk/create_gcj_jvm.sh
new file mode 100644
index 0000000..08f3e4a
--- /dev/null
+++ b/source.local/pasture/openjdk/create_gcj_jvm.sh
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# ---------------------------------------------------------------------------
+# This script creates a directory structure below /usr/lib/jvm and populates
+# it with symlinks to GCC binaries.
+# This will work as a compatibility layer to emulate an Oracle JDK/JRE.
+# This emulation is required in order to compile OpenJDK using GNU java.
+#
+# The same can automatically be achieved in Slackware's gcc packages if
+# the 'configure' command is called with the following additional parameters:
+#     --enable-java-home \
+#     --with-java-home=/usr/lib$LIBDIRSUFFIX/jvm/jre \
+#     --with-jvm-root-dir=/usr/lib$LIBDIRSUFFIX/jvm \
+#     --with-jvm-jar-dir=/usr/lib$LIBDIRSUFFIX/jvm/jvm-exports \
+#     --with-arch-directory=$LIB_ARCH \
+#
+# Author: Eric Hameleers <alien@slackware.com> December 2011
+# ---------------------------------------------------------------------------
+
+# 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=""
+  LIB_ARCH=i386
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=i386
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  LIB_ARCH=amd64
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=$ARCH
+fi
+
+# Where does the OpenJDK SlackBuild expect the GNU java compatibility symlinks:
+JVM=${1:-/usr/lib${LIBDIRSUFFIX}/jvm}
+BINDIR=/usr/bin
+
+# What version of GCC do we have installed:
+GCJVER=$(gcj -dumpversion)
+
+# First, remove the old set of symlinks if they should exist:
+rm -fr $JVM
+
+# Create a JDK compatible directory structure for GNU java:
+mkdir -p $JVM
+mkdir -p $JVM/bin
+mkdir -p $JVM/jre/bin
+mkdir -p $JVM/jre/lib/${LIB_ARCH}/client
+mkdir -p $JVM/jre/lib/${LIB_ARCH}/server
+mkdir -p $JVM/lib
+
+ln -sf $BINDIR/gjar $JVM/bin/jar
+ln -sf $BINDIR/grmic $JVM/bin/rmic
+ln -sf $BINDIR/gjavah $JVM/bin/javah
+ln -sf $BINDIR/jcf-dump $JVM/bin/javap
+ln -sf $BINDIR/gappletviewer $JVM/bin/appletviewer
+ln -sf $BINDIR/grmiregistry $JVM/bin/rmiregistry
+ln -sf $BINDIR/grmiregistry $JVM/jre/bin/rmiregistry
+ln -sf $BINDIR/gkeytool $JVM/bin/keytool
+ln -sf $BINDIR/gkeytool $JVM/jre/bin/keytool
+ln -sf $BINDIR/gij $JVM/bin/java
+ln -sf $BINDIR/ecj $JVM/bin/javac
+ln -sf /usr/lib/gcj-${GCJVER}-11/libjvm.so $JVM/jre/lib/${LIB_ARCH}/client/libjvm.so
+ln -sf /usr/lib/gcj-${GCJVER}-11/libjvm.so $JVM/jre/lib/${LIB_ARCH}/server/libjvm.so
+ln -sf /usr/lib/gcj-${GCJVER}-11/libjawt.so $JVM/jre/lib/${LIB_ARCH}/libjawt.so
+ln -sf /usr/share/java/libgcj-${GCJVER}.jar $JVM/jre/lib/rt.jar
+ln -sf /usr/share/java/libgcj-tools-${GCJVER}.jar $JVM/lib/tools.jar
+ln -sf /usr/include/c++/${GCJVER}/gnu/java $JVM/include
+
+# Add a Eclipse Java Compiler wrapper which is required
+# for bootstrapping OpenJDK using GNU java:
+cat <<EOT > /usr/bin/ecj
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/ecj.jar\${CLASSPATH:+:}\$CLASSPATH \
+  java org.eclipse.jdt.internal.compiler.batch.Main "\$@"
+
+EOT
+chmod 755 /usr/bin/ecj
+
+
diff --git a/source.local/pasture/openjdk/doinst.sh.gz b/source.local/pasture/openjdk/doinst.sh.gz
new file mode 100644
index 0000000..1a8f9de
--- /dev/null
+++ b/source.local/pasture/openjdk/doinst.sh.gz
diff --git a/source.local/pasture/openjdk/fix_seamonkey_pkgconfig.sh b/source.local/pasture/openjdk/fix_seamonkey_pkgconfig.sh
new file mode 100644
index 0000000..671d227
--- /dev/null
+++ b/source.local/pasture/openjdk/fix_seamonkey_pkgconfig.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# ---------------------------------------------------------------------------
+# This script fixes the seamonkye-plugin.pc file and adds libxul.pc.
+# These changes enable the compilation of OpenJDK and its browser plugin.
+# It will probably also be beneficial to the compilation of browser plugins
+# in general.
+#
+# Author: Eric Hameleers <alien@slackware.com> December 2011
+# ---------------------------------------------------------------------------
+
+# 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" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+# Fix the seamonkey-plugin.pc file:
+sed -i -e '/^Cflags: /s, -I${includedir}/java -I${includedir}/plugin, -I${includedir} -DXP_UNIX,' /usr/lib${LIBDIRSUFFIX}/pkgconfig/seamonkey-plugin.pc
+
+# Add a libxul.pc file if needed:
+if [ ! -f /usr/lib${LIBDIRSUFFIX}/pkgconfig/libxul.pc ]; then
+  SEAMONKEY=$(echo /usr/lib${LIBDIRSUFFIX}/seamonkey-* | tail -1 | cut -f2 -d-)
+  cat <<EOT > /usr/lib${LIBDIRSUFFIX}/pkgconfig/libxul.pc
+prefix=/usr
+libdir=/usr/lib${LIBDIRSUFFIX}/seamonkey-$SEAMONKEY
+includedir=/usr/include/seamonkey-$SEAMONKEY
+idldir=/usr/share/idl/seamonkey-$SEAMONKEY
+
+Name: libxul
+Description: The Mozilla Runtime and Embedding Engine
+Version: $SEAMONKEY
+Requires: seamonkey-nspr >= 4.7.1
+Libs: -L\${libdir} -lxul -lxpcom
+Cflags: -I\${includedir} -fshort-wchar
+EOT
+fi
+
diff --git a/source.local/pasture/openjdk/openjdk.SlackBuild b/source.local/pasture/openjdk/openjdk.SlackBuild
new file mode 100755
index 0000000..9338ea4
--- /dev/null
+++ b/source.local/pasture/openjdk/openjdk.SlackBuild
@@ -0,0 +1,319 @@
+#!/bin/sh
+
+# Copyright 2011, 2012  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2012  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.
+
+
+PKGNAM1=openjdk
+PKGNAM2=openjre
+JAVAVER=7u3
+JAVABLD=b03
+ICEDTEA=2.1
+
+VERSION="${JAVAVER}_${JAVABLD}"
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG1=$TMP/package-$PKGNAM1
+PKG2=$TMP/package-$PKGNAM2
+
+# If BOOTSTRAP is set to "YES" then we bootstrap the build using GCC's
+# java compiler (gcj) instead of a depending on a pre-installed version
+# of OpenJDK to build OpenJDK.
+BOOTSTRAP=${BOOTSTRAP:-"NO"}
+
+# Sources the script requires. Note that the Makefile contains SHA256SUM values
+# for all of these tarballs; if the tarball does not verify then it will be
+# downloaded again:
+SRC_CACAO=cacao-a567bcb7f589.tar.gz
+SRC_CORBA=corba.tar.gz
+SRC_HOTSPOT=hotspot.tar.gz
+SRC_ICEWEB=icedtea-web-1.1.4.tar.gz
+SRC_JAXP=jaxp.tar.gz
+SRC_JAXWS=jaxws.tar.gz
+SRC_JDK=jdk.tar.gz
+SRC_LANGTOOLS=langtools.tar.gz
+SRC_OPENJDK=openjdk.tar.gz
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  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=$MARCH ;;
+  esac
+fi
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=i386
+  ARCH_OPTS=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=i386
+  ARCH_OPTS=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  LIB_ARCH=amd64
+  ARCH_OPTS=""
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=$ARCH
+  ARCH_OPTS="--enable-cacao --with-cacao-src-zip=$CWD/sources/${SRC_CACAO}"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=$ARCH
+  ARCH_OPTS="--enable-cacao --with-cacao-src-zip=$CWD/sources/${SRC_CACAO}"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=$ARCH
+  ARCH_OPTS=""
+fi
+
+case "ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+rm -rf $PKG1 $PKG2
+mkdir -p $TMP $PKG1 $PKG2
+cd $TMP
+rm -rf icedtea-$ICEDTEA
+tar xvf $CWD/sources/icedtea-$ICEDTEA.tar.?z* || exit 1
+cd icedtea-$ICEDTEA || 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 {} \;
+
+# We start with creating a proper build environment.
+
+# Prevent an error which aborts the build:
+mkdir -p bootstrap/boot/jre/lib
+
+unset CLASSPATH
+unset JAVA_HOME
+unset MAKEFLAGS
+
+if [ "$BOOTSTRAP" = "YES" -o "$BOOTSTRAP" = "yes" ]; then
+  # Use gcc's java compiler:
+  export JVMDIR=/usr/lib${LIBDIRSUFFIX}/jvm
+  export ALT_BOOTDIR=/usr/lib${LIBDIRSUFFIX}/jvm
+  export ECJJAR=/usr/share/java/ecj.jar
+  export RTJAR=$TMP/icedtea-$ICEDTEA/bootstrap/boot/jre/lib/rt.jar
+  ! echo $PATH | grep -q jvm/bin && export PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH
+  EXTRA_OPTS="--enable-bootstrap --with-gcj=/usr/bin/gcj"
+  # Bootstrap without cacao:
+  ARCH_OPTS=""
+else
+  # Use a pre-installed OpenJDK:
+  export JVMDIR=/usr/lib${LIBDIRSUFFIX}/java
+  EXTRA_OPTS="--disable-bootstrap"
+fi
+
+export ANT_HOME=/usr/share/ant
+export ALT_FREETYPE_LIB_PATH=/usr/lib${LIBDIRSUFFIX}
+export ALT_PARALLEL_COMPILE_JOBS="${NUMJOBS/-j}"
+export BUILD_NUMBER=$JAVABLD
+export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
+export LANG=C
+export OS_VARIANT_NAME="Slackware"
+export OS_VARIANT_VERSION=$(cat /etc/slackware-version | cut -f2 -d' ')
+
+cp $CWD/patches/*.patch $TMP/icedtea-$ICEDTEA/patches/
+export DISTRIBUTION_BOOT_PATCHES="patches/openjdk.arm_fixes.patch patches/icedtea,zero_debuginfo.patch"
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --with-abs-install-dir=/usr/lib${LIBDIRSUFFIX}/java \
+  --with-pkgversion=Slackware \
+  --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
+  --with-corba-src-zip=$CWD/sources/${SRC_CORBA} \
+  --with-hotspot-src-zip=$CWD/sources/${SRC_HOTSPOT} \
+  --with-jaxp-src-zip=$CWD/sources/${SRC_JAXP} \
+  --with-jaxws-src-zip=$CWD/sources/${SRC_JAXWS} \
+  --with-jdk-src-zip=$CWD/sources/${SRC_JDK} \
+  --with-langtools-src-zip=$CWD/sources/${SRC_LANGTOOLS} \
+  --with-openjdk-src-zip=$CWD/sources/${SRC_OPENJDK} \
+  --with-jdk-home=${JVMDIR} \
+  --disable-docs \
+  --disable-jamvm \
+  --disable-jdk-tests \
+  --disable-langtools-tests \
+  --disable-system-lcms \
+  --enable-nss \
+  $ARCH_OPTS \
+  $EXTRA_OPTS \
+  --build=$TARGET
+  #--with-javac=${JVMDIR}/bin/javac \
+
+make VERBOSE=TRUE || exit 1
+
+# Move the generated jre and sdk images to the respective packages:
+mkdir -p $PKG1/usr/lib${LIBDIRSUFFIX} $PKG2/usr/lib${LIBDIRSUFFIX}/java
+cp -a openjdk.build/j2sdk-image \
+  $PKG1/usr/lib${LIBDIRSUFFIX}/java
+cp -a openjdk.build/j2re-image \
+  $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre
+
+# Generate a cacerts file from the certificates installed through our
+# ca-certificates package - the "cacerts" in the OpenJDK sources is empty.
+# This will only work if we already have a proper JDK/JRE installed:
+if which keytool 1>/dev/null 2>&1 ; then
+  mkdir certgen
+  ( cd certgen
+    cp $CWD/scripts/generate-cacerts.pl .
+    for cert in /usr/share/ca-certificates/*/*.crt; do
+      openssl x509 -text -in "${cert}" >> all.crt
+    done
+    perl generate-cacerts.pl keytool all.crt
+    install -p -m0644 cacerts $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security
+    install -p -m0644 cacerts $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security
+  )
+fi
+
+# Pick a selection of fontconfig files:
+cp -a $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.properties.src
+cp -a $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.bfc
+cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.properties.src
+cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.bfc
+
+# Symlinks are present in Slackware historically:
+( cd $PKG1/usr/lib${LIBDIRSUFFIX}
+  ln -sf java jdk${VERSION}
+) || exit 1
+( cd $PKG2/usr/lib${LIBDIRSUFFIX}/java
+  ln -sf jre jre${VERSION}
+) || exit 1
+
+# Add the profile scripts:
+mkdir -p $PKG1/etc/profile.d $PKG2/etc/profile.d
+for file in $(ls $CWD/profile.d/openjdk*) ; do
+  cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \
+    > $PKG1/etc/profile.d/$(basename $file)
+done
+for file in $(ls $CWD/profile.d/openjre*) ; do
+  cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \
+    > $PKG2/etc/profile.d/$(basename $file)
+done
+chmod 755 $PKG1/etc/profile.d/* $PKG2/etc/profile.d/*
+
+# Add menu entries and icons:
+for i in 16 24 32 48 ; do
+  mkdir -p ${PKG1}/usr/share/icons/hicolor/${i}x${i}/apps
+  install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${i}.png \
+  ${PKG1}/usr/share/icons/hicolor/${i}x${i}/apps/java.png 
+  mkdir -p ${PKG2}/usr/share/icons/hicolor/${i}x${i}/apps
+  install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${i}.png \
+  ${PKG2}/usr/share/icons/hicolor/${i}x${i}/apps/java.png 
+done
+mkdir -p ${PKG1}/usr/share/applications
+install -m644 *.desktop ${PKG1}/usr/share/applications/
+mkdir -p ${PKG2}/usr/share/applications
+install -m644 *.desktop ${PKG2}/usr/share/applications/
+
+# User-modifiable configuration files go to /etc :
+mkdir -p $PKG1/etc/java $PKG2/etc/java
+mv $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/jvm.cfg $PKG1/etc/java/jvm.cfg.new
+ln -sf /etc/java/jvm.cfg $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/jvm.cfg
+mv $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.policy $PKG1/etc/java/java.policy.new
+ln -sf /etc/java/java.policy $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.policy
+mv $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.security $PKG1/etc/java/java.security.new
+ln -sf /etc/java/java.security $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.security
+cat $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/nss.cfg | sed -e 's/seamonkey-.*$/seamonkey/' > $PKG1/etc/java/nss.cfg.new
+ln -sf /etc/java/nss.cfg $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/nss.cfg
+# And the jre package:
+mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/jvm.cfg $PKG2/etc/java/jvm.cfg.new
+ln -sf /etc/java/jvm.cfg $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/jvm.cfg
+mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.policy $PKG2/etc/java/java.policy.new
+ln -sf /etc/java/java.policy $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.policy
+mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.security $PKG2/etc/java/java.security.new
+ln -sf /etc/java/java.security $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.security
+
+# NOTE:
+# The openjdk does not build a mozilla plugin: install icedtea-web instead.
+
+( cd $PKG1/usr/lib${LIBDIRSUFFIX}
+  ln -sf ./java/jre/lib/${LIB_ARCH}/server/libjvm.so .
+)
+
+( cd $PKG2/usr/lib${LIBDIRSUFFIX}
+  ln -sf ./java/jre/lib/${LIB_ARCH}/server/libjvm.so .
+)
+
+# Add package description and deal with the .new files:
+mkdir -p $PKG1/install $PKG2/install
+cat $CWD/slack-desc.jdk > $PKG1/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG1/install/doinst.sh
+# The openjre package does not have a nss.cfg:
+cat $CWD/slack-desc.jre > $PKG2/install/slack-desc
+zcat $CWD/doinst.sh.gz | grep -v nss.cfg.new > $PKG2/install/doinst.sh
+
+# Add documentation files:
+mkdir -p $PKG1/usr/doc/$PKGNAM1-$VERSION/icedtea
+mkdir -p $PKG2/usr/doc/$PKGNAM2-$VERSION/icedtea
+( cd openjdk
+  cp -a \
+    ASSEMBLY_EXCEPTION LICENSE README* THIRD_PARTY_README \
+    $PKG1/usr/doc/$PKGNAM1-$VERSION
+  cp -a \
+    ASSEMBLY_EXCEPTION LICENSE README* THIRD_PARTY_README \
+    $PKG2/usr/doc/$PKGNAM2-$VERSION
+)
+cp -a \
+  AUTHORS COPYING HACKING INSTALL NEWS README* THANKYOU \
+  $PKG1/usr/doc/$PKGNAM1-$VERSION/icedtea
+cp -a \
+  AUTHORS COPYING HACKING INSTALL NEWS README* THANKYOU \
+  $PKG2/usr/doc/$PKGNAM2-$VERSION/icedtea
+
+# 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
+  for DOCSDIR in $(echo $PKG1/usr/doc/${PKGNAM1}-$VERSION) \
+    $(echo $PKG2/usr/doc/${PKGNAM2}-$VERSION)
+  do
+    cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+    touch -r ChangeLog $DOCSDIR/ChangeLog
+  done
+fi
+
+# Finally, create the two packages:
+cd $PKG1
+/sbin/makepkg -l y -c n $TMP/$PKGNAM1-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
+cd $PKG2
+/sbin/makepkg -l y -c n $TMP/$PKGNAM2-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source.local/pasture/openjdk/patches/icedtea,zero_debuginfo.patch b/source.local/pasture/openjdk/patches/icedtea,zero_debuginfo.patch
new file mode 100644
index 0000000..68b0e44
--- /dev/null
+++ b/source.local/pasture/openjdk/patches/icedtea,zero_debuginfo.patch
@@ -0,0 +1,53 @@
+--- openjdk/hotspot/make/linux/makefiles/defs.make.orig	2012-02-15 09:26:53.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/defs.make	2012-03-18 23:22:09.000000000 +0100
+@@ -132,7 +132,7 @@
+   # Full Debug Symbols is supported on JDK7 or newer
+ 
+   # Default OBJCOPY comes from GNU Binutils on Linux:
+-  DEF_OBJCOPY=/usr/bin/objcopy
++  DEF_OBJCOPY=feck
+   ifdef CROSS_COMPILE_ARCH
+     # don't try to generate .debuginfo files when cross compiling
+     _JUNK_ := $(shell \
+@@ -215,10 +215,10 @@
+                         $(EXPORT_LIB_DIR)/sa-jdi.jar 
+ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
+                         $(EXPORT_LIB_DIR)/sa-jdi.jar 
+-ifneq ($(OBJCOPY),)
+-  ADD_SA_BINARIES/x86   += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+-  ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+-endif
++#ifneq ($(OBJCOPY),)
++#  ADD_SA_BINARIES/x86   += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++#  ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++#endif
+ ADD_SA_BINARIES/ppc   = 
+ ADD_SA_BINARIES/ia64  = 
+ ADD_SA_BINARIES/arm   = 
+
+--- openjdk-boot/hotspot/make/linux/makefiles/defs.make.orig	2012-02-15 09:26:53.000000000 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/defs.make	2012-03-18 23:22:09.000000000 +0100
+@@ -132,7 +132,7 @@
+   # Full Debug Symbols is supported on JDK7 or newer
+ 
+   # Default OBJCOPY comes from GNU Binutils on Linux:
+-  DEF_OBJCOPY=/usr/bin/objcopy
++  DEF_OBJCOPY=feck
+   ifdef CROSS_COMPILE_ARCH
+     # don't try to generate .debuginfo files when cross compiling
+     _JUNK_ := $(shell \
+@@ -215,10 +215,10 @@
+                         $(EXPORT_LIB_DIR)/sa-jdi.jar 
+ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
+                         $(EXPORT_LIB_DIR)/sa-jdi.jar 
+-ifneq ($(OBJCOPY),)
+-  ADD_SA_BINARIES/x86   += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+-  ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+-endif
++#ifneq ($(OBJCOPY),)
++#  ADD_SA_BINARIES/x86   += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++#  ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++#endif
+ ADD_SA_BINARIES/ppc   = 
+ ADD_SA_BINARIES/ia64  = 
+ ADD_SA_BINARIES/arm   = 
diff --git a/source.local/pasture/openjdk/patches/openjdk.arm_fixes.patch b/source.local/pasture/openjdk/patches/openjdk.arm_fixes.patch
new file mode 100644
index 0000000..47f28dc
--- /dev/null
+++ b/source.local/pasture/openjdk/patches/openjdk.arm_fixes.patch
@@ -0,0 +1,44 @@
+diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk.sav	2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/common/shared/Sanity.gmk	2012-03-07 17:31:26.153840755 -0500
+@@ -814,12 +814,12 @@ ifdef OPENJDK
+ 	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
+ 	    $(ECHO) "Failed to build freetypecheck." ) > $@
+ 
+-    sane-freetype: $(TEMPDIR)/freetypeinfo
+-	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
+-	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+-	          " or higher is required. \n" \
+-		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
+-	fi
++#    sane-freetype: $(TEMPDIR)/freetypeinfo
++#	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
++#	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
++#	          " or higher is required. \n" \
++#		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
++#	fi
+   else
+     #do nothing  (cross-compiling)
+     sane-freetype: 
+diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav	2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/jdk_generic_profile.sh	2012-03-07 17:31:26.154840740 -0500
+@@ -280,7 +280,7 @@ if [ "${ZERO_BUILD}" = true ] ; then
+ 
+   # ZERO_ENDIANNESS is the endianness of the processor
+   case "${ZERO_LIBARCH}" in
+-    i386|amd64|ia64)
++    i386|amd64|ia64|arm)
+       ZERO_ENDIANNESS=little
+       ;;
+     ppc*|s390*|sparc*|alpha)
+@@ -307,6 +307,9 @@ if [ "${ZERO_BUILD}" = true ] ; then
+     s390)
+       ZERO_ARCHFLAG="-m31"
+       ;;
++    arm)
++      ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
++      ;;
+     *)
+       ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
+   esac
diff --git a/source.local/pasture/openjdk/profile.d/openjdk.csh b/source.local/pasture/openjdk/profile.d/openjdk.csh
new file mode 100755
index 0000000..3a1ec7b
--- /dev/null
+++ b/source.local/pasture/openjdk/profile.d/openjdk.csh
@@ -0,0 +1,4 @@
+#!/bin/csh
+setenv JAVA_HOME /usr/lib/java
+setenv MANPATH ${MANPATH}:${JAVA_HOME}/man
+setenv PATH ${PATH}:${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin
diff --git a/source.local/pasture/openjdk/profile.d/openjdk.sh b/source.local/pasture/openjdk/profile.d/openjdk.sh
new file mode 100755
index 0000000..ed0bc73
--- /dev/null
+++ b/source.local/pasture/openjdk/profile.d/openjdk.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export JAVA_HOME=/usr/lib/java
+export MANPATH="${MANPATH}:${JAVA_HOME}/man"
+export PATH="${PATH}:${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
diff --git a/source.local/pasture/openjdk/profile.d/openjre.csh b/source.local/pasture/openjdk/profile.d/openjre.csh
new file mode 100755
index 0000000..47bc078
--- /dev/null
+++ b/source.local/pasture/openjdk/profile.d/openjre.csh
@@ -0,0 +1,4 @@
+#!/bin/csh
+setenv JAVA_HOME /usr/lib/java
+setenv MANPATH ${MANPATH}:${JAVA_HOME}/jre/man
+setenv PATH ${PATH}:${JAVA_HOME}/jre/bin
diff --git a/source.local/pasture/openjdk/profile.d/openjre.sh b/source.local/pasture/openjdk/profile.d/openjre.sh
new file mode 100755
index 0000000..98e9d13
--- /dev/null
+++ b/source.local/pasture/openjdk/profile.d/openjre.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export JAVA_HOME=/usr/lib/java
+export MANPATH="${MANPATH}:${JAVA_HOME}/jre/man"
+export PATH="${PATH}:${JAVA_HOME}/jre/bin"
diff --git a/source.local/pasture/openjdk/scripts/generate-cacerts.pl b/source.local/pasture/openjdk/scripts/generate-cacerts.pl
new file mode 100644
index 0000000..0213fcd
--- /dev/null
+++ b/source.local/pasture/openjdk/scripts/generate-cacerts.pl
@@ -0,0 +1,349 @@
+#!/usr/bin/perl -w
+
+# Obtained from "http://pkgs.fedoraproject.org/gitweb/?p=ca-certificates.git;a=blob_plain;f=generate-cacerts.pl;hb=HEAD"
+
+use diagnostics;
+use Fcntl;
+
+# Copyright (C) 2007, 2008 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
+# OpenSSL's certificate bundle using OpenJDK's keytool.
+
+# First extract each of OpenSSL's bundled certificates into its own
+# aliased filename.
+$file = $ARGV[1];
+open(CERTS, $file);
+@certs = <CERTS>;
+close(CERTS);
+
+$pem_file_count = 0;
+$in_cert_block = 0;
+$write_current_cert = 1;
+foreach $cert (@certs)
+{
+    if ($cert =~ "Certificate:\n")
+    {
+        print "New certificate...\n";
+    }        
+    elsif ($cert =~ /Subject: /)
+    {
+        $_ = $cert;
+        if ($cert =~ /personal-freemail/)
+        {
+            $cert_alias = "thawtepersonalfreemailca";
+        }
+        elsif ($cert =~ /personal-basic/)
+        {
+            $cert_alias = "thawtepersonalbasicca";
+        }
+        elsif ($cert =~ /personal-premium/)
+        {
+            $cert_alias = "thawtepersonalpremiumca";
+        }
+        elsif ($cert =~ /server-certs/)
+        {
+            $cert_alias = "thawteserverca";
+        }
+        elsif ($cert =~ /premium-server/)
+        {
+            $cert_alias = "thawtepremiumserverca";
+        }
+        elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass1ca";
+        }
+        elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
+        {
+            $cert_alias = "verisignclass1g2ca";
+        }
+        elsif ($cert =~
+               /VeriSign Class 1 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass1g3ca";
+        }
+        elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass2ca";
+        }
+        elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
+        {
+            $cert_alias = "verisignclass2g2ca";
+        }
+        elsif ($cert =~
+               /VeriSign Class 2 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass2g3ca";
+        }
+        elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass3ca";
+        }
+        # Version 1 of Class 3 Public Primary Certification Authority
+        # - G2 is added.  Version 3 is excluded.  See below.
+        elsif ($cert =~ /Class 3 Public Primary Certification Authority - G2.*1998/)
+        {
+            $cert_alias = "verisignclass3g2ca";
+        }
+        elsif ($cert =~
+               /VeriSign Class 3 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass3g3ca";
+        }
+        elsif ($cert =~
+               /RSA Data Security.*Secure Server Certification Authority/)
+        {
+            $cert_alias = "rsaserverca";
+        }
+        elsif ($cert =~ /GTE CyberTrust Global Root/)
+        {
+            $cert_alias = "gtecybertrustglobalca";
+        }
+        elsif ($cert =~ /Baltimore CyberTrust Root/)
+        {
+            $cert_alias = "baltimorecybertrustca";
+        }
+        elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
+        {
+            $cert_alias = "entrustclientca";
+        }
+        elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
+        {
+            $cert_alias = "entrustglobalclientca";
+        }
+        elsif ($cert =~ /www.entrust.net\/CPS_2048/)
+        {
+            $cert_alias = "entrust2048ca";
+        }
+        elsif ($cert =~ /www.entrust.net\/CPS incorp /)
+        {
+            $cert_alias = "entrustsslca";
+        }
+        elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
+        {
+            $cert_alias = "entrustgsslca";
+        }
+        elsif ($cert =~ /The Go Daddy Group/)
+        {
+            $cert_alias = "godaddyclass2ca";
+        }
+        elsif ($cert =~ /Starfield Class 2 Certification Authority/)
+        {
+            $cert_alias = "starfieldclass2ca";
+        }
+        elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
+        {
+            $cert_alias = "valicertclass2ca";
+        }
+        elsif ($cert =~ /GeoTrust Global CA$/)
+        {
+            $cert_alias = "geotrustglobalca";
+        }
+        elsif ($cert =~ /Equifax Secure Certificate Authority/)
+        {
+            $cert_alias = "equifaxsecureca";
+        }
+        elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
+        {
+            $cert_alias = "equifaxsecureebusinessca1";
+        }
+        elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
+        {
+            $cert_alias = "equifaxsecureebusinessca2";
+        }
+        elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
+        {
+            $cert_alias = "equifaxsecureglobalebusinessca1";
+        }
+        elsif ($cert =~ /Sonera Class1 CA/)
+        {
+            $cert_alias = "soneraclass1ca";
+        }
+        elsif ($cert =~ /Sonera Class2 CA/)
+        {
+            $cert_alias = "soneraclass2ca";
+        }
+        elsif ($cert =~ /AAA Certificate Services/)
+        {
+            $cert_alias = "comodoaaaca";
+        }
+        elsif ($cert =~ /AddTrust Class 1 CA Root/)
+        {
+            $cert_alias = "addtrustclass1ca";
+        }
+        elsif ($cert =~ /AddTrust External CA Root/)
+        {
+            $cert_alias = "addtrustexternalca";
+        }
+        elsif ($cert =~ /AddTrust Qualified CA Root/)
+        {
+            $cert_alias = "addtrustqualifiedca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Hardware/)
+        {
+            $cert_alias = "utnuserfirsthardwareca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
+        {
+            $cert_alias = "utnuserfirstclientauthemailca";
+        }
+        elsif ($cert =~ /UTN - DATACorp SGC/)
+        {
+            $cert_alias = "utndatacorpsgcca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Object/)
+        {
+            $cert_alias = "utnuserfirstobjectca";
+        }
+        elsif ($cert =~ /America Online Root Certification Authority 1/)
+        {
+            $cert_alias = "aolrootca1";
+        }
+        elsif ($cert =~ /DigiCert Assured ID Root CA/)
+        {
+            $cert_alias = "digicertassuredidrootca";
+        }
+        elsif ($cert =~ /DigiCert Global Root CA/)
+        {
+            $cert_alias = "digicertglobalrootca";
+        }
+        elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
+        {
+            $cert_alias = "digicerthighassuranceevrootca";
+        }
+        elsif ($cert =~ /GlobalSign Root CA$/)
+        {
+            $cert_alias = "globalsignca";
+        }
+        elsif ($cert =~ /GlobalSign Root CA - R2/)
+        {
+            $cert_alias = "globalsignr2ca";
+        }
+        elsif ($cert =~ /Elektronik.*Kas.*2005/)
+        {
+            $cert_alias = "extra-elektronikkas2005";
+        }
+        elsif ($cert =~ /Muntaner 244 Barcelona.*Firmaprofesional/)
+        {
+            $cert_alias = "extra-oldfirmaprofesional";
+        }
+        # Mozilla does not provide these certificates:
+        #   baltimorecodesigningca
+        #   gtecybertrust5ca
+        #   trustcenterclass2caii
+        #   trustcenterclass4caii
+        #   trustcenteruniversalcai
+        else
+        {
+            # Generate an alias using the OU and CN attributes of the
+            # Subject field if both are present, otherwise use only the
+            # CN attribute.  The Subject field must have either the OU
+            # or the CN attribute.
+            $_ = $cert;
+            if ($cert =~ /OU=/)
+            {
+                s/Subject:.*?OU=//;
+                # Remove other occurrences of OU=.
+                s/OU=.*CN=//;
+                # Remove CN= if there were not other occurrences of OU=.
+                s/CN=//;
+                s/\/emailAddress.*//;
+                s/Certificate Authority/ca/g;
+                s/Certification Authority/ca/g;
+            }
+            elsif ($cert =~ /CN=/)
+            {
+                s/Subject:.*CN=//;
+                s/\/emailAddress.*//;
+                s/Certificate Authority/ca/g;
+                s/Certification Authority/ca/g;
+            }
+            s/\W//g;
+            tr/A-Z/a-z/;
+            $cert_alias = "extra-$_";
+        }
+        print "$cert => alias $cert_alias\n";
+    }
+    elsif ($cert =~ "Signature Algorithm: ecdsa")
+    {
+        # Ignore ECC certs since keytool rejects them
+        $write_current_cert = 0;
+        print " => ignoring ECC certificate\n";
+    }
+    elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
+    {
+        if ($in_cert_block != 0)
+        {
+            die "FAIL: $file is malformed.";
+        }
+        $in_cert_block = 1;
+        if ($write_current_cert == 1)
+        {
+            $pem_file_count++;
+            if (!sysopen(PEM, "$cert_alias.pem", O_WRONLY|O_CREAT|O_EXCL)) {
+                $cert_alias = "$cert_alias.1";
+                sysopen(PEM, "$cert_alias.1.pem", O_WRONLY|O_CREAT|O_EXCL)
+                    || die("FAIL: could not open file for $cert_alias.pem: $!");
+            }
+            print PEM $cert;
+            print " => writing $cert_alias.pem...\n";
+        }
+    }
+    elsif ($cert eq "-----END CERTIFICATE-----\n")
+    {
+        $in_cert_block = 0;
+        if ($write_current_cert == 1)
+        {
+            print PEM $cert;
+            close(PEM);
+        }
+        $write_current_cert = 1
+    }
+    else
+    {
+        if ($in_cert_block == 1 && $write_current_cert == 1)
+        {
+            print PEM $cert;
+        }
+    }
+}
+
+# Check that the correct number of .pem files were produced.
+@pem_files = <*.pem>;
+if (@pem_files != $pem_file_count)
+{
+    print "$pem_file_count != ".@pem_files."\n";
+    die "FAIL: Number of .pem files produced does not match".
+        " number of certs read from $file.";
+}
+
+# Now store each cert in the 'cacerts' file using keytool.
+$certs_written_count = 0;
+foreach $pem_file (@pem_files)
+{
+    print "+ Adding $pem_file...\n";
+    if (system("$ARGV[0] -import".
+               " -alias `basename $pem_file .pem`".
+               " -keystore cacerts -noprompt -storepass 'changeit' -file $pem_file") == 0) {
+        $certs_written_count++;
+    } else {
+        print "FAILED\n";
+    }
+}
+
+# Check that the correct number of certs were added to the keystore.
+if ($certs_written_count != $pem_file_count)
+{
+    die "FAIL: Number of certs added to keystore does not match".
+        " number of certs read from $file.";
+}
diff --git a/source.local/pasture/openjdk/slack-desc.jdk b/source.local/pasture/openjdk/slack-desc.jdk
new file mode 100644
index 0000000..2d38ace
--- /dev/null
+++ b/source.local/pasture/openjdk/slack-desc.jdk
@@ -0,0 +1,18 @@
+# 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------------------------------------------------------|
+openjdk: Java(TM) 2 Platform Standard Edition Development Kit.
+openjdk:
+openjdk: The Java 2 SDK software includes tools for developing, testing, and
+openjdk: running programs written in the Java programming language.  This
+openjdk: package contains the Open Source version of the JDK, which holds
+openjdk: everything you need to run Java(TM).
+openjdk:
+openjdk: For additional information, refer to this web page:
+openjdk:   http://openjdk.java.net/
+openjdk:
+openjdk:
diff --git a/source.local/pasture/openjdk/slack-desc.jre b/source.local/pasture/openjdk/slack-desc.jre
new file mode 100644
index 0000000..611233a
--- /dev/null
+++ b/source.local/pasture/openjdk/slack-desc.jre
@@ -0,0 +1,18 @@
+# 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------------------------------------------------------|
+openjre: Java(TM) 2 Platform Standard Edition Runtime Environment.
+openjre:
+openjre: The J2SE(TM) Runtime Environment (JRE) is intended for software
+openjre: developers and vendors to redistribute with their applications.
+openjre: It contains the Java virtual machine, runtime class libraries, and
+openjre: Java application launcher that are necessary to run programs written
+openjre: in the Java programming language.
+openjre:
+openjre: If you need development tools, obtain the jdk from /extra, or see the
+openjre: web page:   http://openjdk.java.net/
+openjre:
diff --git a/source.local/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild b/source.local/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
new file mode 100755
index 0000000..834523b
--- /dev/null
+++ b/source.local/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010  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=dejavu-fonts-ttf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+ARCH=noarch
+BUILD=1
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-dejavu-fonts-ttf
+
+# I suppose we'll be nice and try to fetch this if
+# you know the version you want.
+if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
+  if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.bz2 ]; then
+    if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.xz ]; then
+      lftpget http://dejavu.sourceforge.net/snapshots/dejavu-fonts-ttf-$VERSION.tar.gz
+    fi
+  fi
+fi
+if [ -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
+  gzip -d $CWD/dejavu-fonts-ttf-$VERSION.tar.gz
+  xz -9 $CWD/dejavu-fonts-ttf-$VERSION.tar
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf dejavu-fonts-ttf-$VERSION
+tar xvf $CWD/dejavu-fonts-ttf-$VERSION.tar.?z* || exit 1
+cd dejavu-fonts-ttf-$VERSION || 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 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF/
+cp -a ttf/*.ttf $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/etc/fonts/conf.avail
+mkdir -p $PKG/etc/fonts/conf.d
+( cd fontconfig
+  for file in * ; do
+    cp -a $file $PKG/etc/fonts/conf.avail
+    ( cd $PKG/etc/fonts/conf.d ; ln -sf ../conf.avail/$file . )
+  done
+)
+
+mkdir -p $PKG/usr/doc/dejavu-fonts-ttf-$VERSION
+cp -a \
+  AUTHORS BUGS LICENSE NEWS README* *.txt \
+  $PKG/usr/doc/dejavu-fonts-ttf-$VERSION
+
+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/dejavu-fonts-ttf-$(echo $VERSION | tr - _ )-$ARCH-$BUILD.txz
+
diff --git a/source.local/x/dejavu-fonts-ttf/doinst.sh.gz b/source.local/x/dejavu-fonts-ttf/doinst.sh.gz
new file mode 100644
index 0000000..ad31a20
--- /dev/null
+++ b/source.local/x/dejavu-fonts-ttf/doinst.sh.gz
diff --git a/source.local/x/dejavu-fonts-ttf/slack-desc b/source.local/x/dejavu-fonts-ttf/slack-desc
new file mode 100644
index 0000000..a9952b5
--- /dev/null
+++ b/source.local/x/dejavu-fonts-ttf/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 ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+dejavu-fonts-ttf: dejavu-fonts-ttf (DejaVu fonts)
+dejavu-fonts-ttf:
+dejavu-fonts-ttf: The DejaVu fonts are a font family based on the Bitstream Vera Fonts
+dejavu-fonts-ttf: (http://gnome.org/fonts/).  Its purpose is to provide a wider range
+dejavu-fonts-ttf: of characters (see http://dejavu.sf.net for more information) while
+dejavu-fonts-ttf: maintaining the original look and feel.
+dejavu-fonts-ttf:
+dejavu-fonts-ttf: DejaVu fonts are based on Bitstream Vera fonts version 1.10.
+dejavu-fonts-ttf:
+dejavu-fonts-ttf:
+dejavu-fonts-ttf:
diff --git a/source.local/x/fontconfig/doinst.sh.gz b/source.local/x/fontconfig/doinst.sh.gz
index 7ae68f6..e3315f5 100644
--- a/source.local/x/fontconfig/doinst.sh.gz
+++ b/source.local/x/fontconfig/doinst.sh.gz
diff --git a/source.local/x/fontconfig/fontconfig.10.autohint.diff.gz b/source.local/x/fontconfig/fontconfig.10.autohint.diff.gz
new file mode 100644
index 0000000..ea1d9c2
--- /dev/null
+++ b/source.local/x/fontconfig/fontconfig.10.autohint.diff.gz
diff --git a/source.local/x/fontconfig/fontconfig.SlackBuild b/source.local/x/fontconfig/fontconfig.SlackBuild
index 1e2ab2e..6be1e10 100755
--- a/source.local/x/fontconfig/fontconfig.SlackBuild
+++ b/source.local/x/fontconfig/fontconfig.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=fontconfig
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.10.2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -93,20 +94,36 @@ zcat $CWD/fontconfig.dejavu.diff.gz | patch -p1 --verbose || exit 1
 # index ugly bitmapped fonts):
 zcat $CWD/fontconfig.font.dir.list.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
+# Upstream patch to fix 10-autohint.conf:
+zcat $CWD/fontconfig.10.autohint.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
 CFLAGS=$SLKCFLAGS \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --sysconfdir=/etc \
+  --with-templatedir=/etc/fonts/conf.avail \
+  --with-baseconfigdir=/etc/fonts \
+  --with-configdir=/etc/fonts/conf.d \
+  --with-xmldir=/etc/fonts \
   --localstatedir=/var \
-  --disable-docs \
+  --enable-static=no \
   --build=$TARGET
 
 # Uses a currently non-functional sgml tool, thus '-i':
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Upstream has changed the default templatedir to /usr/share/fontconfig/conf.avail.
+# This change, if accepted, would break any existing font package containing a
+# conf.avail directory.  The safest thing to do is to keep things in the
+# traditional location, but put a link in the new place so that font packages
+# following the new standard location will work.  Let's hear it for being
+# "more correct" at the expense of having things "just work"!
+mkdir -p $PKG/usr/share/fontconfig
+( cd $PKG/usr/share/fontconfig ; ln -sf /etc/fonts/conf.avail . )
+
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* INSTALL NEWS README \
@@ -133,7 +150,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Set up the default options in /etc/fonts/conf.d:
 (  cd $PKG/etc/fonts/conf.d
    for fontconf in \
-        20-fix-globaladvance.conf \
         20-unhint-small-vera.conf \
         30-urw-aliases.conf \
         30-metric-aliases.conf \
@@ -148,7 +164,12 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
         69-unifont.conf \
         80-delicious.conf \
         90-synthetic.conf ; do
-     ln -sf ../conf.avail/$fontconf . || exit 1
+     if [ -r ../conf.avail/$fontconf ]; then
+       ln -sf ../conf.avail/$fontconf .
+     else
+       echo "ERROR:  unable to symlink ../conf.avail/$fontconf, file does not exist."
+       exit 1
+     fi
    done
    if [ ! $? = 0 ]; then
      exit 1
@@ -179,5 +200,5 @@ 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
+/sbin/makepkg -l y -c n --prepend $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source.local/x/fontconfig/fontconfig.dejavu.diff.gz b/source.local/x/fontconfig/fontconfig.dejavu.diff.gz
index d6617a7..af4ee31 100644
--- a/source.local/x/fontconfig/fontconfig.dejavu.diff.gz
+++ b/source.local/x/fontconfig/fontconfig.dejavu.diff.gz
diff --git a/source.local/x/fontconfig/fontconfig.font.dir.list.diff.gz b/source.local/x/fontconfig/fontconfig.font.dir.list.diff.gz
index 88344f5..7aabc3d 100644
--- a/source.local/x/fontconfig/fontconfig.font.dir.list.diff.gz
+++ b/source.local/x/fontconfig/fontconfig.font.dir.list.diff.gz
diff --git a/source.local/x/freeglut/RATIONALE b/source.local/x/freeglut/RATIONALE
new file mode 100644
index 0000000..0e2c59b
--- /dev/null
+++ b/source.local/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.local/x/freeglut/freeglut.SlackBuild b/source.local/x/freeglut/freeglut.SlackBuild
new file mode 100755
index 0000000..88cdc79
--- /dev/null
+++ b/source.local/x/freeglut/freeglut.SlackBuild
@@ -0,0 +1,114 @@
+#!/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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PRGNAM=freeglut
+VERSION=${VERSION:-2.8.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+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=$TRGET || 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.local/x/freeglut/slack-desc b/source.local/x/freeglut/slack-desc
new file mode 100644
index 0000000..9fcda6f
--- /dev/null
+++ b/source.local/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.local/x/glew/glew.SlackBuild b/source.local/x/glew/glew.SlackBuild
index e112c35..e816f5f 100755
--- a/source.local/x/glew/glew.SlackBuild
+++ b/source.local/x/glew/glew.SlackBuild
@@ -20,54 +20,54 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
 # Slackware build script for glew
 
-VERSION=1.5.7
+PKGNAM=glew
+VERSION=${VERSION:-1.9.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j8}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-glew
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP || exit 1
-rm -rf glew-$VERSION
-tar xvf $CWD/glew-${VERSION}.tar.?z* || exit 1
-cd glew-${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 \) \
@@ -90,13 +90,13 @@ make install GLEW_DEST=$PKG/usr || exit 1
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/doc/glew-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   LICENSE* README* doc/* \
-    $PKG/usr/doc/glew-$VERSION
+    $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/glew-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source.local/x/glu/glu.SlackBuild b/source.local/x/glu/glu.SlackBuild
new file mode 100755
index 0000000..02d9261
--- /dev/null
+++ b/source.local/x/glu/glu.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware build script for glu
+
+# 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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PRGNAM=glu
+VERSION=${VERSION:-9.0.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+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=$TARGET || 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
+
+# No docs at all
+
+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.local/x/glu/glu.url b/source.local/x/glu/glu.url
new file mode 100644
index 0000000..4b79b65
--- /dev/null
+++ b/source.local/x/glu/glu.url
@@ -0,0 +1,2 @@
+ftp://ftp.freedesktop.org/pub/mesa/glu/
+http://cgit.freedesktop.org/mesa/glu/
diff --git a/source.local/x/glu/slack-desc b/source.local/x/glu/slack-desc
new file mode 100644
index 0000000..7ede5e9
--- /dev/null
+++ b/source.local/x/glu/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------------------------------------------------------|
+glu: glu (Mesa OpenGL utility library)
+glu:
+glu: glu is the Mesa OpenGL utility library (libGLU).
+glu:
+glu:
+glu:
+glu:
+glu:
+glu:
+glu:
+glu:
diff --git a/source.local/x/libdrm/libdrm.SlackBuild b/source.local/x/libdrm/libdrm.SlackBuild
index 8cc2571..56b75d5 100755
--- a/source.local/x/libdrm/libdrm.SlackBuild
+++ b/source.local/x/libdrm/libdrm.SlackBuild
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=libdrm
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-2.4.42}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -87,9 +88,10 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
   --enable-udev \
-  --enable-nouveau-experimental-api \
-  --enable-vmwgfx-experimental-api \
+  --enable-omap-experimental-api \
+  --enable-exynos-experimental-api \
   --build=$TARGET
 
 # Build and install:
diff --git a/source.local/x/liberation-fonts-ttf/60-liberation.conf b/source.local/x/liberation-fonts-ttf/60-liberation.conf
new file mode 100644
index 0000000..1e7212c
--- /dev/null
+++ b/source.local/x/liberation-fonts-ttf/60-liberation.conf
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $Id: 60-liberation.conf,v 1.1 2008/03/27 11:14:42 root Exp root $ -->
+<fontconfig>
+
+	<!-- Symlinking this file to /etc/fonts/conf.d/ will allow 
+         you to use liberation fonts instead of the microsoft truetype fonts.
+         (from http://uwstopia.nl/blog/2007/05/free-your-fonts) -->
+
+	<!-- Liberation fonts -->
+	<match target="pattern">
+		<test qual="any" name="family"><string>Times New Roman</string></test>
+		<edit name="family" mode="assign"><string>Liberation Serif</string></edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Arial</string></test>
+		<edit name="family" mode="assign"><string>Liberation Sans</string></edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Courier</string></test>
+		<edit name="family" mode="assign"><string>Liberation Mono</string></edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Courier New</string></test>
+		<edit name="family" mode="assign"><string>Liberation Mono</string></edit>
+	</match>
+
+
+</fontconfig>
+
diff --git a/source.local/x/liberation-fonts-ttf/doinst.sh.gz b/source.local/x/liberation-fonts-ttf/doinst.sh.gz
new file mode 100644
index 0000000..ad31a20
--- /dev/null
+++ b/source.local/x/liberation-fonts-ttf/doinst.sh.gz
diff --git a/source.local/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source.local/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
new file mode 100755
index 0000000..2a28f33
--- /dev/null
+++ b/source.local/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# 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
+# 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.
+
+
+VERSION=${VERSION:-1.07.2}
+ARCH=noarch
+BUILD=1
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-liberation-fonts-ttf
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf liberation-fonts-ttf-$VERSION
+tar xvf $CWD/liberation-fonts-ttf-${VERSION}.tar.* || exit 1
+cd liberation-fonts-ttf-${VERSION} || 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 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF/
+cp -a *.ttf $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/liberation-fonts-ttf-$VERSION
+cp -a \
+  AUTHORS COPYING* License.txt README* TODO \
+  $PKG/usr/doc/liberation-fonts-ttf-$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/etc/fonts/conf.{d,avail}
+cat $CWD/60-liberation.conf > $PKG/etc/fonts/conf.avail/60-liberation.conf
+( cd $PKG/etc/fonts/conf.d && \
+  ln -sf ../conf.avail/60-liberation.conf
+)
+
+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/liberation-fonts-ttf-${VERSION}-$ARCH-$BUILD.txz
+
diff --git a/source.local/x/liberation-fonts-ttf/slack-desc b/source.local/x/liberation-fonts-ttf/slack-desc
new file mode 100644
index 0000000..4692800
--- /dev/null
+++ b/source.local/x/liberation-fonts-ttf/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 ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+liberation-fonts-ttf: liberation-fonts-ttf (Liberation TTF Fonts)
+liberation-fonts-ttf:
+liberation-fonts-ttf: Liberation is the collective name of three TrueType font
+liberation-fonts-ttf: families: Liberation Sans, Liberation Serif and Liberation
+liberation-fonts-ttf: Mono.  These fonts are metric-compatible with Arial, Times
+liberation-fonts-ttf: New Roman, and Courier New respectively.
+liberation-fonts-ttf:
+liberation-fonts-ttf: The fonts were developed by Steve Matteson of Ascender Corp.
+liberation-fonts-ttf: for Red Hat, Inc.
+liberation-fonts-ttf:
+liberation-fonts-ttf:
diff --git a/source.local/x/mesa/mesa.SlackBuild b/source.local/x/mesa/mesa.SlackBuild
index 3ed3424..de1db78 100755
--- a/source.local/x/mesa/mesa.SlackBuild
+++ b/source.local/x/mesa/mesa.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,62 +20,67 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=mesa
-VERSION=7.10.2
-DEMOVERS=8.0.1
+VERSION=9.1.1
+DEMOVERS=8.1.0
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j8}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-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
-
 case "$ARCH" in
   arm*)
     # Be sure this list is up-to-date:
-    # ( "sis" driver doesn't compile on ARM. )
-    DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,tdfx,unichrome,swrast"
-    ARCHOPTS=" --with-driver=dri --enable-gles1  --enable-gles2 "
+    DRI_DRIVERS="nouveau,r200,radeon,swrast"
+    GALLIUM_DRIVERS="nouveau,r300,r600,svga,swrast"
+    ARCHOPTS=" --with-driver=dri --enable-gles1  --enable-gles2 --enable-openvg --enable-gallium-egl "
     ;;
   *)
     # 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"
-    ARCHOPTS=" --enable-gallium-nouveau "
+    DRI_DRIVERS="i915,i965,intel,nouveau,r200,radeon,swrast"
+    GALLIUM_DRIVERS="nouveau,r300,r600,swrast"
+    ARCHOPTS=" "
     ;;
 esac
 
 
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mesa
@@ -86,13 +91,11 @@ 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
 
+# Let's kill the warning about operating on a dangling symlink:
+rm -f src/gallium/state_trackers/d3d1x/w32api
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -103,25 +106,22 @@ 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 Mesa 7.9.x 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
 
+# Running autogen to avoid problems if our autotools don't match upstream's:
+./autogen.sh
+
+echo "Running configure now:"
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -133,15 +133,14 @@ CFLAGS="$SLKCFLAGS" \
   --with-dri-drivers="$DRI_DRIVERS" \
   --enable-xcb \
   $ARCHOPTS \
+  --with-gallium-drivers="$GALLIUM_DRIVERS" \
+  --enable-gallium-llvm \
+  --enable-shared-glapi \
   --build=$TARGET
 
-#  --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.local/x/mesa/patches/i915_fragment_shader_disable.patch.gz b/source.local/x/mesa/patches/i915_fragment_shader_disable.patch.gz
deleted file mode 100644
index ba8ff26..0000000
--- a/source.local/x/mesa/patches/i915_fragment_shader_disable.patch.gz
+++ /dev/null
diff --git a/source.local/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz b/source.local/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz
deleted file mode 100644
index 26cf092..0000000
--- a/source.local/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz
+++ /dev/null
diff --git a/source.local/x/mtdev/mtdev.SlackBuild b/source.local/x/mtdev/mtdev.SlackBuild
new file mode 100755
index 0000000..c59308d
--- /dev/null
+++ b/source.local/x/mtdev/mtdev.SlackBuild
@@ -0,0 +1,114 @@
+#!/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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PRGNAM=mtdev
+VERSION=${VERSION:-1.1.3}
+BUILD=${BUILD:-1}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+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 \
+  --disable-static \
+  --build=$TARGET
+
+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.local/x/mtdev/mtdev.url b/source.local/x/mtdev/mtdev.url
new file mode 100644
index 0000000..f1989e1
--- /dev/null
+++ b/source.local/x/mtdev/mtdev.url
@@ -0,0 +1 @@
+http://bitmath.org/code/mtdev/
diff --git a/source.local/x/mtdev/slack-desc b/source.local/x/mtdev/slack-desc
new file mode 100644
index 0000000..0eaaae9
--- /dev/null
+++ b/source.local/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.local/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff.gz b/source.local/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff.gz
new file mode 100644
index 0000000..61d522b
--- /dev/null
+++ b/source.local/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff.gz
diff --git a/source.local/x/wqy-zenhei-font-ttf/slack-desc b/source.local/x/wqy-zenhei-font-ttf/slack-desc
new file mode 100644
index 0000000..cf1f049
--- /dev/null
+++ b/source.local/x/wqy-zenhei-font-ttf/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 ':'.
+
+                   |-----handy-ruler------------------------------------------------------|
+wqy-zenhei-font-ttf: wqy-zenhei-font-ttf (Wen Quan Yi Zen Hei CJK Font)
+wqy-zenhei-font-ttf:
+wqy-zenhei-font-ttf: The WenQuanYi Zen Hei font is a Chinese (or CJK) outline font with
+wqy-zenhei-font-ttf: Hei Ti style (a sans-serif style) Hanzi glyphs.  This font is
+wqy-zenhei-font-ttf: developed for general purpose use of Chinese for formating, printing
+wqy-zenhei-font-ttf: and on-screen display.  This font is also targeted at platform
+wqy-zenhei-font-ttf: independence and the utility for document exchange between various
+wqy-zenhei-font-ttf: operating systems.
+wqy-zenhei-font-ttf:
+wqy-zenhei-font-ttf: wqy-zenhei-font-ttf home: http://wqy.sourceforge.net/en/
+wqy-zenhei-font-ttf:
diff --git a/source.local/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild b/source.local/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild
new file mode 100755
index 0000000..206b45e
--- /dev/null
+++ b/source.local/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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.
+# -----------------------------------------------------------------------------
+#
+# Slackware SlackBuild script 
+# ===========================
+# By:         Eric Hameleers <alien@slackware.com>
+# For:        wqy-zenhei-font-ttf
+# Descr:      Wen Quan Yi Zen Hei CJK Font
+# URL:        http://wqy.sourceforge.net/en/
+#
+# -----------------------------------------------------------------------------
+
+
+PRGNAM=wqy-zenhei-font-ttf
+SRCNAM=wqy-zenhei
+VERSION=${VERSION:-0.9.45}
+BUILD=${BUILD:-1}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+SOURCE="$CWD/${SRCNAM}-${VERSION}.tar.xz"
+FONTDIR="/usr/share/fonts/TTF"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf ${PRGNAM}-${VERSION}
+tar xvf ${SOURCE} || exit 1
+mv ${SRCNAM} ${PRGNAM}-${VERSION} || 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 {} \;
+
+zcat $CWD/fixup-fontconfig-file.diff.gz | patch -p1 || exit 1
+
+# Install font:
+mkdir -p $PKG$FONTDIR
+cp *.ttf *.ttc $PKG$FONTDIR/
+
+# Add the fontconfig file and symlink.
+mkdir -p $PKG/etc/fonts/conf.{d,avail}
+cp 44-wqy-zenhei.conf $PKG/etc/fonts/conf.avail/
+( cd $PKG/etc/fonts/conf.d && \
+  ln -sf ../conf.avail/44-wqy-zenhei.conf
+)
+# One more fontconfig file which we do not activate by default:
+cp 43-wqy-zenhei-sharp.conf $PKG/etc/fonts/conf.avail
+
+# Add a shell script that can set the Zen Hei default display styles:
+mkdir -p $PKG/usr/sbin
+install -m755 zenheiset $PKG/usr/sbin/zenheiset
+
+# Post-install script:
+mkdir -p $PKG/install
+cat << EOT > $PKG/install/doinst.sh
+# There's no need to chroot and do this during initial
+# install, since there is a post-install script that
+# does the same thing, saving time.
+# Update X font indexes and the font cache:
+if [ -x /usr/bin/mkfontdir ]; then
+  /usr/bin/mkfontscale $FONTDIR
+  /usr/bin/mkfontdir $FONTDIR
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache $FONTDIR
+fi
+EOT
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+# Add a package description:
+mkdir -p $PKG/install
+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
+
diff --git a/source.local/x/x11-skel/scripts/xwmconfig b/source.local/x/x11-skel/scripts/xwmconfig
index 944207b..724242a 100644
--- a/source.local/x/x11-skel/scripts/xwmconfig
+++ b/source.local/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.local/x/x11-skel/x11-skel.SlackBuild b/source.local/x/x11-skel/x11-skel.SlackBuild
index aa808eb..2922de9 100755
--- a/source.local/x/x11-skel/x11-skel.SlackBuild
+++ b/source.local/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
@@ -20,28 +20,32 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
-VERSION=7.4
-BUILD=${BUILD:-2}
+VERSION=7.7
+BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  if [ "$ARCH" = "x86_64" ]; then
+    LIBDIRSUFFIX="64"
+  else
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 CWD=$(pwd)
diff --git a/source.local/x/x11/arch.use.flags b/source.local/x/x11/arch.use.flags
deleted file mode 100644
index 2805e07..0000000
--- a/source.local/x/x11/arch.use.flags
+++ /dev/null
@@ -1,17 +0,0 @@
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
diff --git a/source.local/x/x11/build/increment.sh b/source.local/x/x11/build/increment.sh
new file mode 100755
index 0000000..6de5d0d
--- /dev/null
+++ b/source.local/x/x11/build/increment.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# A script to increment build numbers.
+# Call it with the list of the build numbers to increase by one:
+#
+# ./increment.sh xf86-input-acecad xf86-input-aiptek xf86-input-joystick
+#
+# If a build file does not exist, it will be created with a value of 2.
+
+for build in $* ; do
+  if [ ! -r $build ]; then
+    echo "Creating $build with value 2"
+    echo 2 > $build
+  else
+    echo "Incrementing $build $(cat $build) -> $(expr $(cat $build) + 1)"
+    echo $(expr $(cat $build) + 1) > $build
+  fi
+done
diff --git a/source.local/x/x11/build/libX11 b/source.local/x/x11/build/libXaw3d
index 0cfbf08..0cfbf08 100644
--- a/source.local/x/x11/build/libX11
+++ b/source.local/x/x11/build/libXaw3d
diff --git a/source.local/x/x11/build/xcompmgr b/source.local/x/x11/build/xdm
index 0cfbf08..0cfbf08 100644
--- a/source.local/x/x11/build/xcompmgr
+++ b/source.local/x/x11/build/xdm
diff --git a/source.local/x/x11/build/xf86-input-acecad b/source.local/x/x11/build/xf86-input-acecad
index 0cfbf08..00750ed 100644
--- a/source.local/x/x11/build/xf86-input-acecad
+++ b/source.local/x/x11/build/xf86-input-acecad
@@ -1 +1 @@
-2
+3
diff --git a/source.local/x/x11/build/xf86-input-aiptek b/source.local/x/x11/build/xf86-input-aiptek
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/source.local/x/x11/build/xf86-input-aiptek
@@ -0,0 +1 @@
+3
diff --git a/source.local/x/x11/build/xf86-video-radeonhd b/source.local/x/x11/build/xf86-input-evdev
index 0cfbf08..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-radeonhd
+++ b/source.local/x/x11/build/xf86-input-evdev
diff --git a/source.local/x/x11/build/xf86-input-joystick b/source.local/x/x11/build/xf86-input-joystick
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/source.local/x/x11/build/xf86-input-joystick
@@ -0,0 +1 @@
+3
diff --git a/source.local/x/x11/build/xf86-input-keyboard b/source.local/x/x11/build/xf86-input-keyboard
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-input-keyboard
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-input-mouse b/source.local/x/x11/build/xf86-input-mouse
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-input-mouse
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-input-penmount b/source.local/x/x11/build/xf86-input-penmount
index 0cfbf08..00750ed 100644
--- a/source.local/x/x11/build/xf86-input-penmount
+++ b/source.local/x/x11/build/xf86-input-penmount
@@ -1 +1 @@
-2
+3
diff --git a/source.local/x/x11/build/xf86-input-synaptics b/source.local/x/x11/build/xf86-input-synaptics
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-input-synaptics
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-input-vmmouse b/source.local/x/x11/build/xf86-input-vmmouse
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-input-vmmouse
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-input-void b/source.local/x/x11/build/xf86-input-void
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/source.local/x/x11/build/xf86-input-void
@@ -0,0 +1 @@
+3
diff --git a/source.local/x/x11/build/xf86-input-wacom b/source.local/x/x11/build/xf86-input-wacom
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-input-wacom
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-apm b/source.local/x/x11/build/xf86-video-apm
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-apm
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-ark b/source.local/x/x11/build/xf86-video-ark
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-ark
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-ast b/source.local/x/x11/build/xf86-video-ast
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-ast
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-ati b/source.local/x/x11/build/xf86-video-ati
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-ati
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-chips b/source.local/x/x11/build/xf86-video-chips
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-chips
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-cirrus b/source.local/x/x11/build/xf86-video-cirrus
index 00750ed..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-cirrus
+++ b/source.local/x/x11/build/xf86-video-cirrus
@@ -1 +1 @@
-3
+2
diff --git a/source.local/x/x11/build/xf86-video-dummy b/source.local/x/x11/build/xf86-video-dummy
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-dummy
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-geode b/source.local/x/x11/build/xf86-video-geode
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-geode
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-glint b/source.local/x/x11/build/xf86-video-glint
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-glint
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-i128 b/source.local/x/x11/build/xf86-video-i128
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-i128
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-i740 b/source.local/x/x11/build/xf86-video-i740
index 00750ed..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-i740
+++ b/source.local/x/x11/build/xf86-video-i740
@@ -1 +1 @@
-3
+2
diff --git a/source.local/x/x11/build/xf86-video-mach64 b/source.local/x/x11/build/xf86-video-mach64
index 00750ed..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-mach64
+++ b/source.local/x/x11/build/xf86-video-mach64
@@ -1 +1 @@
-3
+2
diff --git a/source.local/x/x11/build/xf86-video-mga b/source.local/x/x11/build/xf86-video-mga
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-mga
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-modesetting b/source.local/x/x11/build/xf86-video-modesetting
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-modesetting
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-neomagic b/source.local/x/x11/build/xf86-video-neomagic
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-neomagic
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-nouveau b/source.local/x/x11/build/xf86-video-nouveau
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-nouveau
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-nv b/source.local/x/x11/build/xf86-video-nv
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-nv
@@ -0,0 +1 @@
+3
diff --git a/source.local/x/x11/build/xf86-video-omap b/source.local/x/x11/build/xf86-video-omap
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-omap
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-openchrome b/source.local/x/x11/build/xf86-video-openchrome
index 0cfbf08..00750ed 100644
--- a/source.local/x/x11/build/xf86-video-openchrome
+++ b/source.local/x/x11/build/xf86-video-openchrome
@@ -1 +1 @@
-2
+3
diff --git a/source.local/x/x11/build/xf86-video-r128 b/source.local/x/x11/build/xf86-video-r128
index 00750ed..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-r128
+++ b/source.local/x/x11/build/xf86-video-r128
@@ -1 +1 @@
-3
+2
diff --git a/source.local/x/x11/build/xf86-video-rendition b/source.local/x/x11/build/xf86-video-rendition
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-rendition
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-s3 b/source.local/x/x11/build/xf86-video-s3
index 00750ed..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-s3
+++ b/source.local/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-3
+2
diff --git a/source.local/x/x11/build/xf86-video-s3virge b/source.local/x/x11/build/xf86-video-s3virge
index 00750ed..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-s3virge
+++ b/source.local/x/x11/build/xf86-video-s3virge
@@ -1 +1 @@
-3
+2
diff --git a/source.local/x/x11/build/xf86-video-savage b/source.local/x/x11/build/xf86-video-savage
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-savage
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-siliconmotion b/source.local/x/x11/build/xf86-video-siliconmotion
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-siliconmotion
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-sis b/source.local/x/x11/build/xf86-video-sis
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-sis
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-sisusb b/source.local/x/x11/build/xf86-video-sisusb
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-sisusb
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-tdfx b/source.local/x/x11/build/xf86-video-tdfx
index 00750ed..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-tdfx
+++ b/source.local/x/x11/build/xf86-video-tdfx
@@ -1 +1 @@
-3
+2
diff --git a/source.local/x/x11/build/xf86-video-trident b/source.local/x/x11/build/xf86-video-trident
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-trident
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-tseng b/source.local/x/x11/build/xf86-video-tseng
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-tseng
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-v4l b/source.local/x/x11/build/xf86-video-v4l
index b8626c4..7f8f011 100644
--- a/source.local/x/x11/build/xf86-video-v4l
+++ b/source.local/x/x11/build/xf86-video-v4l
@@ -1 +1 @@
-4
+7
diff --git a/source.local/x/x11/build/xf86-video-vesa b/source.local/x/x11/build/xf86-video-vesa
index 00750ed..0cfbf08 100644
--- a/source.local/x/x11/build/xf86-video-vesa
+++ b/source.local/x/x11/build/xf86-video-vesa
@@ -1 +1 @@
-3
+2
diff --git a/source.local/x/x11/build/xf86-video-vmware b/source.local/x/x11/build/xf86-video-vmware
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-vmware
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-voodoo b/source.local/x/x11/build/xf86-video-voodoo
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-voodoo
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-xgi b/source.local/x/x11/build/xf86-video-xgi
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-xgi
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xf86-video-xgixp b/source.local/x/x11/build/xf86-video-xgixp
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xf86-video-xgixp
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/build/xpyb b/source.local/x/x11/build/xpyb
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source.local/x/x11/build/xpyb
@@ -0,0 +1 @@
+2
diff --git a/source.local/x/x11/configure/compiz b/source.local/x/x11/configure/compiz
index b98233c..cee0c0c 100644
--- a/source.local/x/x11/configure/compiz
+++ b/source.local/x/x11/configure/compiz
@@ -11,6 +11,6 @@ CXXFLAGS=$SLKCFLAGS \
   --disable-static \
   --disable-gconf \
   --disable-kde \
-  --enable-kde4 \
+  --disable-kde4 \
   --enable-librsvg \
   --build=$TARGET
diff --git a/source.local/x/x11/configure/libXaw3d b/source.local/x/x11/configure/libXaw3d
new file mode 100644
index 0000000..7b6d3ba
--- /dev/null
+++ b/source.local/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=$TARGET
diff --git a/source.local/x/x11/configure/xdm b/source.local/x/x11/configure/xdm
deleted file mode 100644
index c90abcb..0000000
--- a/source.local/x/x11/configure/xdm
+++ /dev/null
@@ -1,14 +0,0 @@
-LDFLAGS="-ldl" \
-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 \
-  --build=$TARGET
-
diff --git a/source.local/x/x11/configure/xf86-input-vmmouse b/source.local/x/x11/configure/xf86-input-vmmouse
index 11f4777..26ba20e 100644
--- a/source.local/x/x11/configure/xf86-input-vmmouse
+++ b/source.local/x/x11/configure/xf86-input-vmmouse
@@ -8,8 +8,7 @@ CXXFLAGS=$SLKCFLAGS \
   --infodir=/usr/info \
   --mandir=/usr/man \
   --disable-static \
-  --with-hal-bin-dir=/usr/bin \
-  --with-hal-callouts-dir=/usr/libexec \
-  --with-hal-fdi-dir=/usr/share/hal/fdi/policy/10osvendor \
-  --with-udev-rules-dir=none \
+  --with-hal-bin-dir=none \
+  --with-hal-callouts-dir=none \
+  --with-hal-fdi-dir=none \
   --build=$TARGET
diff --git a/source.local/x/x11/configure/xf86-video-armsoc b/source.local/x/x11/configure/xf86-video-armsoc
new file mode 100644
index 0000000..6f20af8
--- /dev/null
+++ b/source.local/x/x11/configure/xf86-video-armsoc
@@ -0,0 +1,17 @@
+[ ! -x configure ] && sh ./autogen.sh
+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 \
+  --build=$TARGET
+
+# To prevent build errors:
+sed -i 's/-Werror[^ ]*//g' src/Makefile Makefile
+
diff --git a/source.local/x/x11/configure/xf86-video-ati b/source.local/x/x11/configure/xf86-video-ati
deleted file mode 100644
index 5b26061..0000000
--- a/source.local/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=$TARGET
diff --git a/source.local/x/x11/configure/xf86-video-nouveau b/source.local/x/x11/configure/xf86-video-nouveau
deleted file mode 100644
index 41d24f8..0000000
--- a/source.local/x/x11/configure/xf86-video-nouveau
+++ /dev/null
@@ -1,11 +0,0 @@
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --disable-static \
-  --build=$TARGET
diff --git a/source.local/x/x11/configure/xorg-server b/source.local/x/x11/configure/xorg-server
index dd465dd..61f775e 100644
--- a/source.local/x/x11/configure/xorg-server
+++ b/source.local/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=$TARGET
 
+#  --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.local/x/x11/doinst.sh/xdm b/source.local/x/x11/doinst.sh/xdm
index bb08dc5..e1d7252 100644
--- a/source.local/x/x11/doinst.sh/xdm
+++ b/source.local/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.local/x/x11/makepkg/xorg-server b/source.local/x/x11/makepkg/xorg-server
index 67b93c9..4f47738 100644
--- a/source.local/x/x11/makepkg/xorg-server
+++ b/source.local/x/x11/makepkg/xorg-server
@@ -33,3 +33,10 @@ cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr
 cd $PKG
 /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
 
+if [ "$UPGRADE_PACKAGES" = "yes" ]; then
+  /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+  /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+  /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+  /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+fi
+
diff --git a/source.local/x/x11/modularize b/source.local/x/x11/modularize
index 47da583..7d07876 100644
--- a/source.local/x/x11/modularize
+++ b/source.local/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,32 @@ 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
+transset
 twm
 util-macros
 videoproto
 viewres
-windowswmproto
 x11perf
 xauth
 xbacklight
@@ -150,8 +139,13 @@ xbitmaps
 xcalc
 xcb-proto
 xcb-util
+xcb-util-image
+xcb-util-keysyms
+xcb-util-renderutil
+xcb-util-wm
 xclipboard
 xclock
+xcm
 xcmiscproto
 xcmsdb
 xcompmgr
@@ -169,7 +163,6 @@ xextproto
 xeyes
 xf86-input-acecad
 xf86-input-aiptek
-xf86-input-citron
 xf86-input-evdev
 xf86-input-joystick
 xf86-input-keyboard
@@ -179,27 +172,28 @@ xf86-input-synaptics
 xf86-input-vmmouse
 xf86-input-void
 xf86-input-wacom
-xf86-video-geode
 xf86-video-apm
-xf86-video-ark
+xf86-video-armsoc
 xf86-video-ast
 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-omap
 xf86-video-openchrome
+xf86-video-qxl
 xf86-video-r128
 xf86-video-rendition
 xf86-video-s3
@@ -208,13 +202,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,7 +210,6 @@ xf86-video-v4l
 xf86-video-vesa
 xf86-video-vmware
 xf86-video-voodoo
-xf86-video-wsfb
 xf86-video-xgi
 xf86-video-xgixp
 xf86bigfontproto
@@ -231,14 +217,11 @@ xf86dga
 xf86dgaproto
 xf86driproto
 xf86miscproto
-xf86rushproto
 xf86vidmodeproto
 xfd
-xfindproxy
 xfontsel
 xfs
 xfsinfo
-xfwp
 xgamma
 xgc
 xhost
@@ -265,27 +248,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.local/x/x11/noarch b/source.local/x/x11/noarch
index 79eb0e5..480ffc2 100644
--- a/source.local/x/x11/noarch
+++ b/source.local/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.local/x/x11/package-blacklist b/source.local/x/x11/package-blacklist
index 3776249..4eeae20 100644
--- a/source.local/x/x11/package-blacklist
+++ b/source.local/x/x11/package-blacklist
@@ -2,6 +2,10 @@
 # this platform) below.  Just the package name -- no version
 # number is needed.
 
+# ARM only packages:
+# They also say in the README for this one that it is not yet ready:
+xf86-video-omap
+
 # MacOS related packages:
 applewmproto
 windowswmproto
@@ -35,5 +39,5 @@ constype
 xf86-video-nsc
 
 # We don't want this one, as it causes failure of X with no xorg.conf
-xf86-video-fbdev
+XXXf86-video-fbdev
 
diff --git a/source.local/x/x11/patch/xf86-video-apm.patch b/source.local/x/x11/patch/xf86-video-apm.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-apm.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-ark.patch b/source.local/x/x11/patch/xf86-video-ark.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-ark.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-armsoc.patch b/source.local/x/x11/patch/xf86-video-armsoc.patch
new file mode 100644
index 0000000..d758194
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-armsoc.patch
@@ -0,0 +1,10 @@
+# Provide API compat between xorg-server post 1.13 and pre it.
+zcat $CWD/patch/xf86-video-armsoc/x11.driver.xf86-video-armsoc.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-armsoc/x11.driver.xf86-video-armsoc.patch.gz b/source.local/x/x11/patch/xf86-video-armsoc/x11.driver.xf86-video-armsoc.patch.gz
new file mode 100644
index 0000000..08f84e2
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-armsoc/x11.driver.xf86-video-armsoc.patch.gz
diff --git a/source.local/x/x11/patch/xf86-video-ast.patch b/source.local/x/x11/patch/xf86-video-ast.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-ast.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-chips.patch b/source.local/x/x11/patch/xf86-video-chips.patch
new file mode 100644
index 0000000..a9ddcaa
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-chips.patch
@@ -0,0 +1,25 @@
+# Rationale for this is here:
+
+# commit bde65934fe8b40a5fdc8a469d0355caca59e81b5
+# Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+# Date:   Sat Jul 21 09:27:10 2012 -0700
+# 
+#     Add iopl.h to source lists in util/Makefile.am so it gets packaged
+#     
+#     Was missed when it was created in commit c421f2477c9999, since
+#     "make distcheck" passes due to configure determining it can't
+#     build the utils without the header and moving on.
+#     
+#     Reported-by: Andreas Radke <a.radke@arcor.de>
+#     Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+# iopl.h obtained from git repo
+cp $CWD/patch/xf86-video-chips/iopl.h util/ \
+     || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-chips/iopl.h b/source.local/x/x11/patch/xf86-video-chips/iopl.h
new file mode 100644
index 0000000..e08207c
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-chips/iopl.h
@@ -0,0 +1,60 @@
+#ifdef __NetBSD__
+#  include <sys/types.h>
+#  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
+       /* 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/source.local/x/x11/patch/xf86-video-dummy.patch b/source.local/x/x11/patch/xf86-video-dummy.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-dummy.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-fbdev.patch b/source.local/x/x11/patch/xf86-video-fbdev.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-fbdev.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-geode.patch b/source.local/x/x11/patch/xf86-video-geode.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-geode.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-glint.patch b/source.local/x/x11/patch/xf86-video-glint.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-glint.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-i128.patch b/source.local/x/x11/patch/xf86-video-i128.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-i128.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-i740.patch b/source.local/x/x11/patch/xf86-video-i740.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-i740.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-neomagic.patch b/source.local/x/x11/patch/xf86-video-neomagic.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-neomagic.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-nv.patch b/source.local/x/x11/patch/xf86-video-nv.patch
new file mode 100644
index 0000000..5e71368
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-nv.patch
@@ -0,0 +1,10 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l '#include <mibstore.h>' * | while read file ; do
+  sed -i "s/#include <mibstore.h>//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-openchrome.patch b/source.local/x/x11/patch/xf86-video-openchrome.patch
new file mode 100644
index 0000000..304a71e
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-openchrome.patch
@@ -0,0 +1,2 @@
+zcat $CWD/patch/xf86-video-openchrome/xf86-video-openchrome.76515c8a369346d76864e55610a6a747d9b152d8.diff.gz | patch -p1 --verbose \
+     || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source.local/x/x11/patch/xf86-video-openchrome/xf86-video-openchrome.76515c8a369346d76864e55610a6a747d9b152d8.diff.gz b/source.local/x/x11/patch/xf86-video-openchrome/xf86-video-openchrome.76515c8a369346d76864e55610a6a747d9b152d8.diff.gz
new file mode 100644
index 0000000..699e5b4
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-openchrome/xf86-video-openchrome.76515c8a369346d76864e55610a6a747d9b152d8.diff.gz
diff --git a/source.local/x/x11/patch/xf86-video-rendition.patch b/source.local/x/x11/patch/xf86-video-rendition.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-rendition.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-s3.patch b/source.local/x/x11/patch/xf86-video-s3.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-s3.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-sis.patch b/source.local/x/x11/patch/xf86-video-sis.patch
new file mode 100644
index 0000000..45276b4
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-sis.patch
@@ -0,0 +1,2 @@
+zcat $CWD/patch/xf86-video-sis/sis-0.10.7-git.patch.gz | patch -p1 --verbose \
+     || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source.local/x/x11/patch/xf86-video-sis/sis-0.10.7-git.patch.gz b/source.local/x/x11/patch/xf86-video-sis/sis-0.10.7-git.patch.gz
new file mode 100644
index 0000000..dd727b9
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-sis/sis-0.10.7-git.patch.gz
diff --git a/source.local/x/x11/patch/xf86-video-sisusb.patch b/source.local/x/x11/patch/xf86-video-sisusb.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-sisusb.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-tdfx.patch b/source.local/x/x11/patch/xf86-video-tdfx.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-tdfx.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-tga.patch b/source.local/x/x11/patch/xf86-video-tga.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-tga.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-trident.patch b/source.local/x/x11/patch/xf86-video-trident.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-trident.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-tseng.patch b/source.local/x/x11/patch/xf86-video-tseng.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-tseng.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-vesa.patch b/source.local/x/x11/patch/xf86-video-vesa.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-vesa.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-vmware.patch b/source.local/x/x11/patch/xf86-video-vmware.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-vmware.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-xgi.patch b/source.local/x/x11/patch/xf86-video-xgi.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-xgi.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xf86-video-xgixp.patch b/source.local/x/x11/patch/xf86-video-xgixp.patch
new file mode 100644
index 0000000..17d7e82
--- /dev/null
+++ b/source.local/x/x11/patch/xf86-video-xgixp.patch
@@ -0,0 +1,7 @@
+# Remove obsolete references to mibstore.h and miInitializeBackingStore():
+grep -r -l '#include "mibstore.h"' * | while read file ; do
+  sed -i "s/#include \"mibstore.h\"//g" $file
+done
+grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
+  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
+done
diff --git a/source.local/x/x11/patch/xorg-server.patch b/source.local/x/x11/patch/xorg-server.patch
index e3218a0..01be43a 100644
--- a/source.local/x/x11/patch/xorg-server.patch
+++ b/source.local/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.local/x/x11/patch/xorg-server/x11.startwithblackscreen.diff.gz b/source.local/x/x11/patch/xorg-server/x11.startwithblackscreen.diff.gz
index f90cf23..18f8fd9 100644
--- a/source.local/x/x11/patch/xorg-server/x11.startwithblackscreen.diff.gz
+++ b/source.local/x/x11/patch/xorg-server/x11.startwithblackscreen.diff.gz
diff --git a/source.local/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz b/source.local/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz
deleted file mode 100644
index 35929f6..0000000
--- a/source.local/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz
+++ /dev/null
diff --git a/source.local/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff.gz b/source.local/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff.gz
deleted file mode 100644
index f7bab50..0000000
--- a/source.local/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff.gz
+++ /dev/null
diff --git a/source.local/x/x11/post-install/lbxproxy.post-install b/source.local/x/x11/post-install/lbxproxy.post-install
deleted file mode 100644
index 9bb1103..0000000
--- a/source.local/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.local/x/x11/post-install/libXaw3d.post-install b/source.local/x/x11/post-install/libXaw3d.post-install
new file mode 100644
index 0000000..5b2d5bf
--- /dev/null
+++ b/source.local/x/x11/post-install/libXaw3d.post-install
@@ -0,0 +1,29 @@
+
+# Copyright 2009, 2012  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.
+#
+
+# Create some compat symlinks for older versions:
+
+( cd $PKG/usr/lib
+  ln -sf libXaw3d.so.8 libXaw3d.so.6
+  ln -sf libXaw3d.so.8 libXaw3d.so.7
+)
+
diff --git a/source.local/x/x11/post-install/proxymngr.post-install b/source.local/x/x11/post-install/proxymngr.post-install
deleted file mode 100644
index 29c647c..0000000
--- a/source.local/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.local/x/x11/post-install/rstart.post-install b/source.local/x/x11/post-install/rstart.post-install
deleted file mode 100644
index d51ad34..0000000
--- a/source.local/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.local/x/x11/post-install/util-macros.post-install b/source.local/x/x11/post-install/util-macros.post-install
deleted file mode 100644
index b25fb34..0000000
--- a/source.local/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.local/x/x11/post-install/xcb-util.post-install b/source.local/x/x11/post-install/xcb-util.post-install
new file mode 100644
index 0000000..ac26917
--- /dev/null
+++ b/source.local/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.local/x/x11/post-install/xdm.post-install b/source.local/x/x11/post-install/xdm.post-install
index 83dcf78..73611b4 100644
--- a/source.local/x/x11/post-install/xdm.post-install
+++ b/source.local/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.local/x/x11/post-install/xf86-input-wacom.post-install b/source.local/x/x11/post-install/xf86-input-wacom.post-install
new file mode 100644
index 0000000..d2b17ec
--- /dev/null
+++ b/source.local/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.local/x/x11/post-install/xf86-input-wacom/60-wacom.rules b/source.local/x/x11/post-install/xf86-input-wacom/60-wacom.rules
new file mode 100644
index 0000000..5922478
--- /dev/null
+++ b/source.local/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.local/x/x11/post-install/xsm.post-install b/source.local/x/x11/post-install/xsm.post-install
deleted file mode 100644
index 509b844..0000000
--- a/source.local/x/x11/post-install/xsm.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
-  mv xsm $PKG/etc/X11
-  ln -sf ../../../etc/X11/xsm .
-)
diff --git a/source.local/x/x11/slack-desc/applewmproto b/source.local/x/x11/slack-desc/applewmproto
deleted file mode 100644
index 4a81b79..0000000
--- a/source.local/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.local/x/x11/slack-desc/appres b/source.local/x/x11/slack-desc/appres
index e397c8c..001a3f3 100644
--- a/source.local/x/x11/slack-desc/appres
+++ b/source.local/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.local/x/x11/slack-desc/bdftopcf b/source.local/x/x11/slack-desc/bdftopcf
index cb2a80a..c9514c1 100644
--- a/source.local/x/x11/slack-desc/bdftopcf
+++ b/source.local/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.local/x/x11/slack-desc/beforelight b/source.local/x/x11/slack-desc/beforelight
index 20549ac..a2a5f48 100644
--- a/source.local/x/x11/slack-desc/beforelight
+++ b/source.local/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.local/x/x11/slack-desc/bigreqsproto b/source.local/x/x11/slack-desc/bigreqsproto
index 55c66bb..8b35e52 100644
--- a/source.local/x/x11/slack-desc/bigreqsproto
+++ b/source.local/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.local/x/x11/slack-desc/bitmap b/source.local/x/x11/slack-desc/bitmap
index 72423e7..60ed7c7 100644
--- a/source.local/x/x11/slack-desc/bitmap
+++ b/source.local/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.local/x/x11/slack-desc/compiz b/source.local/x/x11/slack-desc/compiz
index e139911..c81aae0 100644
--- a/source.local/x/x11/slack-desc/compiz
+++ b/source.local/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.local/x/x11/slack-desc/compositeproto b/source.local/x/x11/slack-desc/compositeproto
index 63e26c7..197ece9 100644
--- a/source.local/x/x11/slack-desc/compositeproto
+++ b/source.local/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.local/x/x11/slack-desc/constype b/source.local/x/x11/slack-desc/constype
deleted file mode 100644
index ddcf95d..0000000
--- a/source.local/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.local/x/x11/slack-desc/damageproto b/source.local/x/x11/slack-desc/damageproto
index 98c085f..5998b60 100644
--- a/source.local/x/x11/slack-desc/damageproto
+++ b/source.local/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.local/x/x11/slack-desc/dmxproto b/source.local/x/x11/slack-desc/dmxproto
index a9598f9..7df2c84 100644
--- a/source.local/x/x11/slack-desc/dmxproto
+++ b/source.local/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.local/x/x11/slack-desc/dri2proto b/source.local/x/x11/slack-desc/dri2proto
index c416449..06ac495 100644
--- a/source.local/x/x11/slack-desc/dri2proto
+++ b/source.local/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.local/x/x11/slack-desc/editres b/source.local/x/x11/slack-desc/editres
index efdc8d7..01fe56c 100644
--- a/source.local/x/x11/slack-desc/editres
+++ b/source.local/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.local/x/x11/slack-desc/encodings b/source.local/x/x11/slack-desc/encodings
index a6de351..9d35da9 100644
--- a/source.local/x/x11/slack-desc/encodings
+++ b/source.local/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.local/x/x11/slack-desc/evieext b/source.local/x/x11/slack-desc/evieext
index 36a135e..cff1b67 100644
--- a/source.local/x/x11/slack-desc/evieext
+++ b/source.local/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.local/x/x11/slack-desc/fixesproto b/source.local/x/x11/slack-desc/fixesproto
index 7e1a1ea..83cfded 100644
--- a/source.local/x/x11/slack-desc/fixesproto
+++ b/source.local/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.local/x/x11/slack-desc/font-adobe-100dpi b/source.local/x/x11/slack-desc/font-adobe-100dpi
index 50996b1..ea59df8 100644
--- a/source.local/x/x11/slack-desc/font-adobe-100dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-adobe-75dpi b/source.local/x/x11/slack-desc/font-adobe-75dpi
index ca91ae5..fac2cc4 100644
--- a/source.local/x/x11/slack-desc/font-adobe-75dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-adobe-utopia-100dpi b/source.local/x/x11/slack-desc/font-adobe-utopia-100dpi
index 956f6d5..29cebe2 100644
--- a/source.local/x/x11/slack-desc/font-adobe-utopia-100dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-adobe-utopia-75dpi b/source.local/x/x11/slack-desc/font-adobe-utopia-75dpi
index 7357179..1c941b8 100644
--- a/source.local/x/x11/slack-desc/font-adobe-utopia-75dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-adobe-utopia-type1 b/source.local/x/x11/slack-desc/font-adobe-utopia-type1
index 5f6d7d1..7c6141c 100644
--- a/source.local/x/x11/slack-desc/font-adobe-utopia-type1
+++ b/source.local/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.local/x/x11/slack-desc/font-alias b/source.local/x/x11/slack-desc/font-alias
index d5e513d..8f34e38 100644
--- a/source.local/x/x11/slack-desc/font-alias
+++ b/source.local/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.local/x/x11/slack-desc/font-arabic-misc b/source.local/x/x11/slack-desc/font-arabic-misc
index bf9d34e..8f2d661 100644
--- a/source.local/x/x11/slack-desc/font-arabic-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-bh-100dpi b/source.local/x/x11/slack-desc/font-bh-100dpi
index 3db086b..2ec6407 100644
--- a/source.local/x/x11/slack-desc/font-bh-100dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-bh-75dpi b/source.local/x/x11/slack-desc/font-bh-75dpi
index ab93f8a..36f1efd 100644
--- a/source.local/x/x11/slack-desc/font-bh-75dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi b/source.local/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
index d289f9a..30805c8 100644
--- a/source.local/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi b/source.local/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
index a9ae87e..23c5b8e 100644
--- a/source.local/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-bh-ttf b/source.local/x/x11/slack-desc/font-bh-ttf
index 5965002..2d69556 100644
--- a/source.local/x/x11/slack-desc/font-bh-ttf
+++ b/source.local/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.local/x/x11/slack-desc/font-bh-type1 b/source.local/x/x11/slack-desc/font-bh-type1
index eb61ed8..7d988cd 100644
--- a/source.local/x/x11/slack-desc/font-bh-type1
+++ b/source.local/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.local/x/x11/slack-desc/font-bitstream-100dpi b/source.local/x/x11/slack-desc/font-bitstream-100dpi
index 3ebccef..d2461bb 100644
--- a/source.local/x/x11/slack-desc/font-bitstream-100dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-bitstream-75dpi b/source.local/x/x11/slack-desc/font-bitstream-75dpi
index 49b1f26..8604be9 100644
--- a/source.local/x/x11/slack-desc/font-bitstream-75dpi
+++ b/source.local/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.local/x/x11/slack-desc/font-bitstream-speedo b/source.local/x/x11/slack-desc/font-bitstream-speedo
index f5db39e..51236f9 100644
--- a/source.local/x/x11/slack-desc/font-bitstream-speedo
+++ b/source.local/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.local/x/x11/slack-desc/font-bitstream-type1 b/source.local/x/x11/slack-desc/font-bitstream-type1
index c2c8c89..ce26f50 100644
--- a/source.local/x/x11/slack-desc/font-bitstream-type1
+++ b/source.local/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.local/x/x11/slack-desc/font-cronyx-cyrillic b/source.local/x/x11/slack-desc/font-cronyx-cyrillic
index 1d8aa0c..5e5dd4f 100644
--- a/source.local/x/x11/slack-desc/font-cronyx-cyrillic
+++ b/source.local/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.local/x/x11/slack-desc/font-cursor-misc b/source.local/x/x11/slack-desc/font-cursor-misc
index 846a7ee..99b22e0 100644
--- a/source.local/x/x11/slack-desc/font-cursor-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-daewoo-misc b/source.local/x/x11/slack-desc/font-daewoo-misc
index ea2a14f..82cedda 100644
--- a/source.local/x/x11/slack-desc/font-daewoo-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-dec-misc b/source.local/x/x11/slack-desc/font-dec-misc
index 9f1f845..be0b1be 100644
--- a/source.local/x/x11/slack-desc/font-dec-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-ibm-type1 b/source.local/x/x11/slack-desc/font-ibm-type1
index 773d7c5..44388e4 100644
--- a/source.local/x/x11/slack-desc/font-ibm-type1
+++ b/source.local/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.local/x/x11/slack-desc/font-isas-misc b/source.local/x/x11/slack-desc/font-isas-misc
index 2be2ce7..437bb42 100644
--- a/source.local/x/x11/slack-desc/font-isas-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-jis-misc b/source.local/x/x11/slack-desc/font-jis-misc
index bbdf362..6541bbc 100644
--- a/source.local/x/x11/slack-desc/font-jis-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-micro-misc b/source.local/x/x11/slack-desc/font-micro-misc
index f26eae3..aa2a389 100644
--- a/source.local/x/x11/slack-desc/font-micro-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-misc-cyrillic b/source.local/x/x11/slack-desc/font-misc-cyrillic
index 4e443cb..8317cb6 100644
--- a/source.local/x/x11/slack-desc/font-misc-cyrillic
+++ b/source.local/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.local/x/x11/slack-desc/font-misc-ethiopic b/source.local/x/x11/slack-desc/font-misc-ethiopic
index edaa227..16f735a 100644
--- a/source.local/x/x11/slack-desc/font-misc-ethiopic
+++ b/source.local/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.local/x/x11/slack-desc/font-misc-meltho b/source.local/x/x11/slack-desc/font-misc-meltho
index a30da3d..7af6d1b 100644
--- a/source.local/x/x11/slack-desc/font-misc-meltho
+++ b/source.local/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.local/x/x11/slack-desc/font-misc-misc b/source.local/x/x11/slack-desc/font-misc-misc
index 99c7d8a..bdf59a8 100644
--- a/source.local/x/x11/slack-desc/font-misc-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-mutt-misc b/source.local/x/x11/slack-desc/font-mutt-misc
index f1f7a24..c273a72 100644
--- a/source.local/x/x11/slack-desc/font-mutt-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-schumacher-misc b/source.local/x/x11/slack-desc/font-schumacher-misc
index 4d7c58b..55546ea 100644
--- a/source.local/x/x11/slack-desc/font-schumacher-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-screen-cyrillic b/source.local/x/x11/slack-desc/font-screen-cyrillic
index 9d65d38..b60e6da 100644
--- a/source.local/x/x11/slack-desc/font-screen-cyrillic
+++ b/source.local/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.local/x/x11/slack-desc/font-sony-misc b/source.local/x/x11/slack-desc/font-sony-misc
index 8fc8b85..8a53988 100644
--- a/source.local/x/x11/slack-desc/font-sony-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-sun-misc b/source.local/x/x11/slack-desc/font-sun-misc
index d2fd1a3..d941087 100644
--- a/source.local/x/x11/slack-desc/font-sun-misc
+++ b/source.local/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.local/x/x11/slack-desc/font-util b/source.local/x/x11/slack-desc/font-util
index 4c6a2b2..05e2f05 100644
--- a/source.local/x/x11/slack-desc/font-util
+++ b/source.local/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.local/x/x11/slack-desc/font-winitzki-cyrillic b/source.local/x/x11/slack-desc/font-winitzki-cyrillic
index c278dff..573c09f 100644
--- a/source.local/x/x11/slack-desc/font-winitzki-cyrillic
+++ b/source.local/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.local/x/x11/slack-desc/font-xfree86-type1 b/source.local/x/x11/slack-desc/font-xfree86-type1
index 57ab76c..1e70a7d 100644
--- a/source.local/x/x11/slack-desc/font-xfree86-type1
+++ b/source.local/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.local/x/x11/slack-desc/fontcacheproto b/source.local/x/x11/slack-desc/fontcacheproto
index 8388f4c..eaec530 100644
--- a/source.local/x/x11/slack-desc/fontcacheproto
+++ b/source.local/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.local/x/x11/slack-desc/fontsproto b/source.local/x/x11/slack-desc/fontsproto
index 7f5c20a..a46da29 100644
--- a/source.local/x/x11/slack-desc/fontsproto
+++ b/source.local/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.local/x/x11/slack-desc/fonttosfnt b/source.local/x/x11/slack-desc/fonttosfnt
index 158fe2e..1f80973 100644
--- a/source.local/x/x11/slack-desc/fonttosfnt
+++ b/source.local/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.local/x/x11/slack-desc/fslsfonts b/source.local/x/x11/slack-desc/fslsfonts
index ca4c416..53957d1 100644
--- a/source.local/x/x11/slack-desc/fslsfonts
+++ b/source.local/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.local/x/x11/slack-desc/fstobdf b/source.local/x/x11/slack-desc/fstobdf
index ada9e2a..4a28eb7 100644
--- a/source.local/x/x11/slack-desc/fstobdf
+++ b/source.local/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.local/x/x11/slack-desc/gccmakedep b/source.local/x/x11/slack-desc/gccmakedep
index 1220112..21db55c 100644
--- a/source.local/x/x11/slack-desc/gccmakedep
+++ b/source.local/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.local/x/x11/slack-desc/glproto b/source.local/x/x11/slack-desc/glproto
index 2c2ddb6..6d0b506 100644
--- a/source.local/x/x11/slack-desc/glproto
+++ b/source.local/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.local/x/x11/slack-desc/iceauth b/source.local/x/x11/slack-desc/iceauth
index 17b0197..54f525d 100644
--- a/source.local/x/x11/slack-desc/iceauth
+++ b/source.local/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.local/x/x11/slack-desc/ico b/source.local/x/x11/slack-desc/ico
index 025dd68..b4aeb4a 100644
--- a/source.local/x/x11/slack-desc/ico
+++ b/source.local/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.local/x/x11/slack-desc/imake b/source.local/x/x11/slack-desc/imake
index 8b1d563..53599eb 100644
--- a/source.local/x/x11/slack-desc/imake
+++ b/source.local/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.local/x/x11/slack-desc/inputproto b/source.local/x/x11/slack-desc/inputproto
index 6b9a330..d5e5867 100644
--- a/source.local/x/x11/slack-desc/inputproto
+++ b/source.local/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.local/x/x11/slack-desc/intel-gpu-tools b/source.local/x/x11/slack-desc/intel-gpu-tools
index b9cdf7c..3fcee9a 100644
--- a/source.local/x/x11/slack-desc/intel-gpu-tools
+++ b/source.local/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.local/x/x11/slack-desc/kbproto b/source.local/x/x11/slack-desc/kbproto
index c9703ab..822d8cf 100644
--- a/source.local/x/x11/slack-desc/kbproto
+++ b/source.local/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.local/x/x11/slack-desc/lbxproxy b/source.local/x/x11/slack-desc/lbxproxy
deleted file mode 100644
index 578f938..0000000
--- a/source.local/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.local/x/x11/slack-desc/libAppleWM b/source.local/x/x11/slack-desc/libAppleWM
deleted file mode 100644
index d556251..0000000
--- a/source.local/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.local/x/x11/slack-desc/libFS b/source.local/x/x11/slack-desc/libFS
index 6fe37f3..6554f51 100644
--- a/source.local/x/x11/slack-desc/libFS
+++ b/source.local/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.local/x/x11/slack-desc/libICE b/source.local/x/x11/slack-desc/libICE
index 78a4761..47b7492 100644
--- a/source.local/x/x11/slack-desc/libICE
+++ b/source.local/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.local/x/x11/slack-desc/libSM b/source.local/x/x11/slack-desc/libSM
index 06803b3..1929290 100644
--- a/source.local/x/x11/slack-desc/libSM
+++ b/source.local/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.local/x/x11/slack-desc/libWindowsWM b/source.local/x/x11/slack-desc/libWindowsWM
deleted file mode 100644
index 162e44b..0000000
--- a/source.local/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.local/x/x11/slack-desc/libX11 b/source.local/x/x11/slack-desc/libX11
index e7f0127..2ec4f39 100644
--- a/source.local/x/x11/slack-desc/libX11
+++ b/source.local/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.local/x/x11/slack-desc/libXScrnSaver b/source.local/x/x11/slack-desc/libXScrnSaver
index dea8d86..ae6eea7 100644
--- a/source.local/x/x11/slack-desc/libXScrnSaver
+++ b/source.local/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.local/x/x11/slack-desc/libXTrap b/source.local/x/x11/slack-desc/libXTrap
deleted file mode 100644
index 51443de..0000000
--- a/source.local/x/x11/slack-desc/libXTrap
+++ /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------------------------------------------------------|
-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:
diff --git a/source.local/x/x11/slack-desc/libXau b/source.local/x/x11/slack-desc/libXau
index f2b0920..6e565d7 100644
--- a/source.local/x/x11/slack-desc/libXau
+++ b/source.local/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.local/x/x11/slack-desc/libXaw b/source.local/x/x11/slack-desc/libXaw
index 3174674..727adea 100644
--- a/source.local/x/x11/slack-desc/libXaw
+++ b/source.local/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.local/x/x11/slack-desc/libXaw3d b/source.local/x/x11/slack-desc/libXaw3d
new file mode 100644
index 0000000..48f7ddc
--- /dev/null
+++ b/source.local/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.local/x/x11/slack-desc/libXcm b/source.local/x/x11/slack-desc/libXcm
new file mode 100644
index 0000000..0516aaf
--- /dev/null
+++ b/source.local/x/x11/slack-desc/libXcm
@@ -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------------------------------------------------------|
+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.local/x/x11/slack-desc/libXcomposite b/source.local/x/x11/slack-desc/libXcomposite
index 2fcbe06..cf43dc4 100644
--- a/source.local/x/x11/slack-desc/libXcomposite
+++ b/source.local/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.local/x/x11/slack-desc/libXcursor b/source.local/x/x11/slack-desc/libXcursor
index 1e91164..2906c6a 100644
--- a/source.local/x/x11/slack-desc/libXcursor
+++ b/source.local/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.local/x/x11/slack-desc/libXdamage b/source.local/x/x11/slack-desc/libXdamage
index 58f917d..05c618b 100644
--- a/source.local/x/x11/slack-desc/libXdamage
+++ b/source.local/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.local/x/x11/slack-desc/libXdmcp b/source.local/x/x11/slack-desc/libXdmcp
index fc03f5b..f3dc239 100644
--- a/source.local/x/x11/slack-desc/libXdmcp
+++ b/source.local/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.local/x/x11/slack-desc/libXevie b/source.local/x/x11/slack-desc/libXevie
index c970159..2af8d87 100644
--- a/source.local/x/x11/slack-desc/libXevie
+++ b/source.local/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.local/x/x11/slack-desc/libXext b/source.local/x/x11/slack-desc/libXext
index cb5b395..a636363 100644
--- a/source.local/x/x11/slack-desc/libXext
+++ b/source.local/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.local/x/x11/slack-desc/libXfixes b/source.local/x/x11/slack-desc/libXfixes
index 9b6b9df..3c44fa4 100644
--- a/source.local/x/x11/slack-desc/libXfixes
+++ b/source.local/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.local/x/x11/slack-desc/libXfont b/source.local/x/x11/slack-desc/libXfont
index 109b391..d78d6a0 100644
--- a/source.local/x/x11/slack-desc/libXfont
+++ b/source.local/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.local/x/x11/slack-desc/libXfontcache b/source.local/x/x11/slack-desc/libXfontcache
index 735bdaa..fdf8ca3 100644
--- a/source.local/x/x11/slack-desc/libXfontcache
+++ b/source.local/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.local/x/x11/slack-desc/libXft b/source.local/x/x11/slack-desc/libXft
index a87a87d..856e282 100644
--- a/source.local/x/x11/slack-desc/libXft
+++ b/source.local/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.local/x/x11/slack-desc/libXi b/source.local/x/x11/slack-desc/libXi
index f3f0c63..4585f82 100644
--- a/source.local/x/x11/slack-desc/libXi
+++ b/source.local/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.local/x/x11/slack-desc/libXinerama b/source.local/x/x11/slack-desc/libXinerama
index e01ab02..3b16b81 100644
--- a/source.local/x/x11/slack-desc/libXinerama
+++ b/source.local/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.local/x/x11/slack-desc/libXmu b/source.local/x/x11/slack-desc/libXmu
index dd6aff0..de36044 100644
--- a/source.local/x/x11/slack-desc/libXmu
+++ b/source.local/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.local/x/x11/slack-desc/libXp b/source.local/x/x11/slack-desc/libXp
index 16eb84a..b68a666 100644
--- a/source.local/x/x11/slack-desc/libXp
+++ b/source.local/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.local/x/x11/slack-desc/libXpm b/source.local/x/x11/slack-desc/libXpm
index 82d0438..77c809a 100644
--- a/source.local/x/x11/slack-desc/libXpm
+++ b/source.local/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.local/x/x11/slack-desc/libXprintAppUtil b/source.local/x/x11/slack-desc/libXprintAppUtil
deleted file mode 100644
index 4ef7b3e..0000000
--- a/source.local/x/x11/slack-desc/libXprintAppUtil
+++ /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------------------------------------------------------|
-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:
diff --git a/source.local/x/x11/slack-desc/libXprintUtil b/source.local/x/x11/slack-desc/libXprintUtil
deleted file mode 100644
index bcad341..0000000
--- a/source.local/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.local/x/x11/slack-desc/libXrandr b/source.local/x/x11/slack-desc/libXrandr
index c86d49a..ad2e243 100644
--- a/source.local/x/x11/slack-desc/libXrandr
+++ b/source.local/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.local/x/x11/slack-desc/libXrender b/source.local/x/x11/slack-desc/libXrender
index fe9f3b5..c5fe726 100644
--- a/source.local/x/x11/slack-desc/libXrender
+++ b/source.local/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.local/x/x11/slack-desc/libXres b/source.local/x/x11/slack-desc/libXres
index 783719f..4582cd5 100644
--- a/source.local/x/x11/slack-desc/libXres
+++ b/source.local/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.local/x/x11/slack-desc/libXt b/source.local/x/x11/slack-desc/libXt
index 9a03bd9..3b8df4b 100644
--- a/source.local/x/x11/slack-desc/libXt
+++ b/source.local/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.local/x/x11/slack-desc/libXtst b/source.local/x/x11/slack-desc/libXtst
index f71c847..63b93c0 100644
--- a/source.local/x/x11/slack-desc/libXtst
+++ b/source.local/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.local/x/x11/slack-desc/libXv b/source.local/x/x11/slack-desc/libXv
index 3bfe029..d72865b 100644
--- a/source.local/x/x11/slack-desc/libXv
+++ b/source.local/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.local/x/x11/slack-desc/libXvMC b/source.local/x/x11/slack-desc/libXvMC
index 5557fdb..aecd7f3 100644
--- a/source.local/x/x11/slack-desc/libXvMC
+++ b/source.local/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.local/x/x11/slack-desc/libXxf86dga b/source.local/x/x11/slack-desc/libXxf86dga
index 99492bc..8802325 100644
--- a/source.local/x/x11/slack-desc/libXxf86dga
+++ b/source.local/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.local/x/x11/slack-desc/libXxf86misc b/source.local/x/x11/slack-desc/libXxf86misc
index 8c69ded..ccc2c29 100644
--- a/source.local/x/x11/slack-desc/libXxf86misc
+++ b/source.local/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.local/x/x11/slack-desc/libXxf86vm b/source.local/x/x11/slack-desc/libXxf86vm
index 0c4820a..872c892 100644
--- a/source.local/x/x11/slack-desc/libXxf86vm
+++ b/source.local/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.local/x/x11/slack-desc/libdmx b/source.local/x/x11/slack-desc/libdmx
index f757df9..893fa67 100644
--- a/source.local/x/x11/slack-desc/libdmx
+++ b/source.local/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.local/x/x11/slack-desc/libfontenc b/source.local/x/x11/slack-desc/libfontenc
index 78b26b0..0172d1a 100644
--- a/source.local/x/x11/slack-desc/libfontenc
+++ b/source.local/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.local/x/x11/slack-desc/liblbxutil b/source.local/x/x11/slack-desc/liblbxutil
deleted file mode 100644
index 0a42196..0000000
--- a/source.local/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.local/x/x11/slack-desc/liboldX b/source.local/x/x11/slack-desc/liboldX
deleted file mode 100644
index d8e65ba..0000000
--- a/source.local/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.local/x/x11/slack-desc/libpciaccess b/source.local/x/x11/slack-desc/libpciaccess
index 0c499f7..c3d6d64 100644
--- a/source.local/x/x11/slack-desc/libpciaccess
+++ b/source.local/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.local/x/x11/slack-desc/libpthread-stubs b/source.local/x/x11/slack-desc/libpthread-stubs
index 8c0c0e5..e64f33d 100644
--- a/source.local/x/x11/slack-desc/libpthread-stubs
+++ b/source.local/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.local/x/x11/slack-desc/libxkbfile b/source.local/x/x11/slack-desc/libxkbfile
index ffaa00a..fe2d59f 100644
--- a/source.local/x/x11/slack-desc/libxkbfile
+++ b/source.local/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.local/x/x11/slack-desc/libxkbui b/source.local/x/x11/slack-desc/libxkbui
deleted file mode 100644
index 332ad41..0000000
--- a/source.local/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.local/x/x11/slack-desc/listres b/source.local/x/x11/slack-desc/listres
index 16ae55b..f14aa2c 100644
--- a/source.local/x/x11/slack-desc/listres
+++ b/source.local/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.local/x/x11/slack-desc/lndir b/source.local/x/x11/slack-desc/lndir
index 0a73ae9..c9a27e2 100644
--- a/source.local/x/x11/slack-desc/lndir
+++ b/source.local/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.local/x/x11/slack-desc/luit b/source.local/x/x11/slack-desc/luit
index ab7f144..cd9d966 100644
--- a/source.local/x/x11/slack-desc/luit
+++ b/source.local/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.local/x/x11/slack-desc/makedepend b/source.local/x/x11/slack-desc/makedepend
index 444713a..ec831dd 100644
--- a/source.local/x/x11/slack-desc/makedepend
+++ b/source.local/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.local/x/x11/slack-desc/mkcomposecache b/source.local/x/x11/slack-desc/mkcomposecache
index c219f99..ed04a55 100644
--- a/source.local/x/x11/slack-desc/mkcomposecache
+++ b/source.local/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.local/x/x11/slack-desc/mkfontdir b/source.local/x/x11/slack-desc/mkfontdir
index 681db8f..3f97b7e 100644
--- a/source.local/x/x11/slack-desc/mkfontdir
+++ b/source.local/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.local/x/x11/slack-desc/mkfontscale b/source.local/x/x11/slack-desc/mkfontscale
index 57c6f82..176336f 100644
--- a/source.local/x/x11/slack-desc/mkfontscale
+++ b/source.local/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.local/x/x11/slack-desc/oclock b/source.local/x/x11/slack-desc/oclock
index 7e4b2ac..1ec87ce 100644
--- a/source.local/x/x11/slack-desc/oclock
+++ b/source.local/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.local/x/x11/slack-desc/pixman b/source.local/x/x11/slack-desc/pixman
index 350e53d..73c9344 100644
--- a/source.local/x/x11/slack-desc/pixman
+++ b/source.local/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.local/x/x11/slack-desc/printproto b/source.local/x/x11/slack-desc/printproto
index 3aa4fe0..28fb1a2 100644
--- a/source.local/x/x11/slack-desc/printproto
+++ b/source.local/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.local/x/x11/slack-desc/proxymngr b/source.local/x/x11/slack-desc/proxymngr
deleted file mode 100644
index 63a9066..0000000
--- a/source.local/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.local/x/x11/slack-desc/randrproto b/source.local/x/x11/slack-desc/randrproto
index a56827c..f97ca09 100644
--- a/source.local/x/x11/slack-desc/randrproto
+++ b/source.local/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.local/x/x11/slack-desc/recordproto b/source.local/x/x11/slack-desc/recordproto
index caecfd7..4fc28e9 100644
--- a/source.local/x/x11/slack-desc/recordproto
+++ b/source.local/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.local/x/x11/slack-desc/rendercheck b/source.local/x/x11/slack-desc/rendercheck
index 9503468..e8a502e 100644
--- a/source.local/x/x11/slack-desc/rendercheck
+++ b/source.local/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.local/x/x11/slack-desc/renderproto b/source.local/x/x11/slack-desc/renderproto
index cdc21f0..ef667f9 100644
--- a/source.local/x/x11/slack-desc/renderproto
+++ b/source.local/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.local/x/x11/slack-desc/resourceproto b/source.local/x/x11/slack-desc/resourceproto
index 8303f74..6881a8e 100644
--- a/source.local/x/x11/slack-desc/resourceproto
+++ b/source.local/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.local/x/x11/slack-desc/rgb b/source.local/x/x11/slack-desc/rgb
index 34263a0..f339502 100644
--- a/source.local/x/x11/slack-desc/rgb
+++ b/source.local/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.local/x/x11/slack-desc/rstart b/source.local/x/x11/slack-desc/rstart
deleted file mode 100644
index e009e28..0000000
--- a/source.local/x/x11/slack-desc/rstart
+++ /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------------------------------------------------------|
-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:
diff --git a/source.local/x/x11/slack-desc/scripts b/source.local/x/x11/slack-desc/scripts
deleted file mode 100644
index 549159b..0000000
--- a/source.local/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.local/x/x11/slack-desc/scrnsaverproto b/source.local/x/x11/slack-desc/scrnsaverproto
index 70142f8..3218b7e 100644
--- a/source.local/x/x11/slack-desc/scrnsaverproto
+++ b/source.local/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.local/x/x11/slack-desc/sessreg b/source.local/x/x11/slack-desc/sessreg
index 8a85e32..0da458b 100644
--- a/source.local/x/x11/slack-desc/sessreg
+++ b/source.local/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.local/x/x11/slack-desc/setxkbmap b/source.local/x/x11/slack-desc/setxkbmap
index 99beaa9..a3b1841 100644
--- a/source.local/x/x11/slack-desc/setxkbmap
+++ b/source.local/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.local/x/x11/slack-desc/showfont b/source.local/x/x11/slack-desc/showfont
index b53ce29..24665ef 100644
--- a/source.local/x/x11/slack-desc/showfont
+++ b/source.local/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.local/x/x11/slack-desc/smproxy b/source.local/x/x11/slack-desc/smproxy
index a8bc597..c40480a 100644
--- a/source.local/x/x11/slack-desc/smproxy
+++ b/source.local/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.local/x/x11/slack-desc/transset b/source.local/x/x11/slack-desc/transset
new file mode 100644
index 0000000..1e1128c
--- /dev/null
+++ b/source.local/x/x11/slack-desc/transset
@@ -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------------------------------------------------------|
+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.local/x/x11/slack-desc/trapproto b/source.local/x/x11/slack-desc/trapproto
deleted file mode 100644
index 5b0a217..0000000
--- a/source.local/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.local/x/x11/slack-desc/twm b/source.local/x/x11/slack-desc/twm
index 78c09f2..590eec4 100644
--- a/source.local/x/x11/slack-desc/twm
+++ b/source.local/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.local/x/x11/slack-desc/util-macros b/source.local/x/x11/slack-desc/util-macros
index 3942663..f339dfa 100644
--- a/source.local/x/x11/slack-desc/util-macros
+++ b/source.local/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.local/x/x11/slack-desc/videoproto b/source.local/x/x11/slack-desc/videoproto
index e90690c..f65573b 100644
--- a/source.local/x/x11/slack-desc/videoproto
+++ b/source.local/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.local/x/x11/slack-desc/viewres b/source.local/x/x11/slack-desc/viewres
index e710f02..05682ea 100644
--- a/source.local/x/x11/slack-desc/viewres
+++ b/source.local/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.local/x/x11/slack-desc/windowswmproto b/source.local/x/x11/slack-desc/windowswmproto
deleted file mode 100644
index 38e9772..0000000
--- a/source.local/x/x11/slack-desc/windowswmproto
+++ /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------------------------------------------------------|
-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:
diff --git a/source.local/x/x11/slack-desc/x11-app b/source.local/x/x11/slack-desc/x11-app
deleted file mode 100644
index 2667d32..0000000
--- a/source.local/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.local/x/x11/slack-desc/x11-data b/source.local/x/x11/slack-desc/x11-data
deleted file mode 100644
index 0b8ef63..0000000
--- a/source.local/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.local/x/x11/slack-desc/x11-doc b/source.local/x/x11/slack-desc/x11-doc
deleted file mode 100644
index 8ac7b8b..0000000
--- a/source.local/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.local/x/x11/slack-desc/x11-driver b/source.local/x/x11/slack-desc/x11-driver
deleted file mode 100644
index 3196549..0000000
--- a/source.local/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.local/x/x11/slack-desc/x11-font b/source.local/x/x11/slack-desc/x11-font
deleted file mode 100644
index b0bf50f..0000000
--- a/source.local/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.local/x/x11/slack-desc/x11-lib b/source.local/x/x11/slack-desc/x11-lib
deleted file mode 100644
index 3090338..0000000
--- a/source.local/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.local/x/x11/slack-desc/x11-proto b/source.local/x/x11/slack-desc/x11-proto
deleted file mode 100644
index 1c1f976..0000000
--- a/source.local/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.local/x/x11/slack-desc/x11-util b/source.local/x/x11/slack-desc/x11-util
deleted file mode 100644
index a5d3028..0000000
--- a/source.local/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.local/x/x11/slack-desc/x11perf b/source.local/x/x11/slack-desc/x11perf
index 8d6996a..fc51a61 100644
--- a/source.local/x/x11/slack-desc/x11perf
+++ b/source.local/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.local/x/x11/slack-desc/xauth b/source.local/x/x11/slack-desc/xauth
index 71829a5..837b45b 100644
--- a/source.local/x/x11/slack-desc/xauth
+++ b/source.local/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.local/x/x11/slack-desc/xbacklight b/source.local/x/x11/slack-desc/xbacklight
index 914a6a7..45d0a7a 100644
--- a/source.local/x/x11/slack-desc/xbacklight
+++ b/source.local/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.local/x/x11/slack-desc/xbiff b/source.local/x/x11/slack-desc/xbiff
index ef65aff..289c973 100644
--- a/source.local/x/x11/slack-desc/xbiff
+++ b/source.local/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.local/x/x11/slack-desc/xbitmaps b/source.local/x/x11/slack-desc/xbitmaps
index 91b0a4d..cdcd814 100644
--- a/source.local/x/x11/slack-desc/xbitmaps
+++ b/source.local/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.local/x/x11/slack-desc/xcalc b/source.local/x/x11/slack-desc/xcalc
index d0f6d2e..4e1101e 100644
--- a/source.local/x/x11/slack-desc/xcalc
+++ b/source.local/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.local/x/x11/slack-desc/xcb-proto b/source.local/x/x11/slack-desc/xcb-proto
index 7273659..c66b714 100644
--- a/source.local/x/x11/slack-desc/xcb-proto
+++ b/source.local/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.local/x/x11/slack-desc/xcb-util b/source.local/x/x11/slack-desc/xcb-util
index 4507229..040881b 100644
--- a/source.local/x/x11/slack-desc/xcb-util
+++ b/source.local/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.local/x/x11/slack-desc/xcb-util-image b/source.local/x/x11/slack-desc/xcb-util-image
new file mode 100644
index 0000000..ffa50aa
--- /dev/null
+++ b/source.local/x/x11/slack-desc/xcb-util-image
@@ -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------------------------------------------------------|
+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.local/x/x11/slack-desc/xcb-util-keysyms b/source.local/x/x11/slack-desc/xcb-util-keysyms
new file mode 100644
index 0000000..a629d39
--- /dev/null
+++ b/source.local/x/x11/slack-desc/xcb-util-keysyms
@@ -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------------------------------------------------------|
+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.local/x/x11/slack-desc/xcb-util-renderutil b/source.local/x/x11/slack-desc/xcb-util-renderutil
new file mode 100644
index 0000000..1cec334
--- /dev/null
+++ b/source.local/x/x11/slack-desc/xcb-util-renderutil
@@ -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------------------------------------------------------|
+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.local/x/x11/slack-desc/xcb-util-wm b/source.local/x/x11/slack-desc/xcb-util-wm
new file mode 100644
index 0000000..8d5103a
--- /dev/null
+++ b/source.local/x/x11/slack-desc/xcb-util-wm
@@ -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------------------------------------------------------|
+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.local/x/x11/slack-desc/xclipboard b/source.local/x/x11/slack-desc/xclipboard
index 9f30920..fc0bcb4 100644
--- a/source.local/x/x11/slack-desc/xclipboard
+++ b/source.local/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.local/x/x11/slack-desc/xclock b/source.local/x/x11/slack-desc/xclock
index 04781f5..39cb9ff 100644
--- a/source.local/x/x11/slack-desc/xclock
+++ b/source.local/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.local/x/x11/slack-desc/xcm b/source.local/x/x11/slack-desc/xcm
new file mode 100644
index 0000000..d7ba583
--- /dev/null
+++ b/source.local/x/x11/slack-desc/xcm
@@ -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------------------------------------------------------|
+xcm: xcm (X color management tools)
+xcm:
+xcm: Tools based on libXcm, a library for colour management on X.
+xcm: xcmddc requests EDID from a monitor over the i2c bus.
+xcm: xcmedid is for parsing EDID data blocks. 
+xcm: xcmevents observes X11 colour management events.
+xcm:
+xcm:
+xcm:
+xcm:
+xcm:
diff --git a/source.local/x/x11/slack-desc/xcmiscproto b/source.local/x/x11/slack-desc/xcmiscproto
index a8c9dcc..d729125 100644
--- a/source.local/x/x11/slack-desc/xcmiscproto
+++ b/source.local/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.local/x/x11/slack-desc/xcmsdb b/source.local/x/x11/slack-desc/xcmsdb
index 9075a18..058adf0 100644
--- a/source.local/x/x11/slack-desc/xcmsdb
+++ b/source.local/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.local/x/x11/slack-desc/xcompmgr b/source.local/x/x11/slack-desc/xcompmgr
index 1381b7b..f5527a8 100644
--- a/source.local/x/x11/slack-desc/xcompmgr
+++ b/source.local/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.local/x/x11/slack-desc/xconsole b/source.local/x/x11/slack-desc/xconsole
index f3a8f2b..2a543f2 100644
--- a/source.local/x/x11/slack-desc/xconsole
+++ b/source.local/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.local/x/x11/slack-desc/xcursor-themes b/source.local/x/x11/slack-desc/xcursor-themes
index d3ffeeb..dbe8023 100644
--- a/source.local/x/x11/slack-desc/xcursor-themes
+++ b/source.local/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.local/x/x11/slack-desc/xcursorgen b/source.local/x/x11/slack-desc/xcursorgen
index bce6934..b084b9d 100644
--- a/source.local/x/x11/slack-desc/xcursorgen
+++ b/source.local/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.local/x/x11/slack-desc/xdbedizzy b/source.local/x/x11/slack-desc/xdbedizzy
index 03ecda0..122d3cf 100644
--- a/source.local/x/x11/slack-desc/xdbedizzy
+++ b/source.local/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.local/x/x11/slack-desc/xditview b/source.local/x/x11/slack-desc/xditview
index 82b175f..60eebb7 100644
--- a/source.local/x/x11/slack-desc/xditview
+++ b/source.local/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.local/x/x11/slack-desc/xdm b/source.local/x/x11/slack-desc/xdm
index 88446a5..1216980 100644
--- a/source.local/x/x11/slack-desc/xdm
+++ b/source.local/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.local/x/x11/slack-desc/xdpyinfo b/source.local/x/x11/slack-desc/xdpyinfo
index 80af8f4..8c6c48f 100644
--- a/source.local/x/x11/slack-desc/xdpyinfo
+++ b/source.local/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.local/x/x11/slack-desc/xdriinfo b/source.local/x/x11/slack-desc/xdriinfo
index e5850b3..bcddebf 100644
--- a/source.local/x/x11/slack-desc/xdriinfo
+++ b/source.local/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.local/x/x11/slack-desc/xedit b/source.local/x/x11/slack-desc/xedit
index 00e969c..6916c0c 100644
--- a/source.local/x/x11/slack-desc/xedit
+++ b/source.local/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.local/x/x11/slack-desc/xev b/source.local/x/x11/slack-desc/xev
index 6e95b7f..4e78a1b 100644
--- a/source.local/x/x11/slack-desc/xev
+++ b/source.local/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.local/x/x11/slack-desc/xextproto b/source.local/x/x11/slack-desc/xextproto
index 53df9fe..6ea870d 100644
--- a/source.local/x/x11/slack-desc/xextproto
+++ b/source.local/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.local/x/x11/slack-desc/xeyes b/source.local/x/x11/slack-desc/xeyes
index ddf82f0..7e1297e 100644
--- a/source.local/x/x11/slack-desc/xeyes
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-acecad b/source.local/x/x11/slack-desc/xf86-input-acecad
index 26ca95c..e3421df 100644
--- a/source.local/x/x11/slack-desc/xf86-input-acecad
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-aiptek b/source.local/x/x11/slack-desc/xf86-input-aiptek
index f7721e5..1ed2424 100644
--- a/source.local/x/x11/slack-desc/xf86-input-aiptek
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-calcomp b/source.local/x/x11/slack-desc/xf86-input-calcomp
deleted file mode 100644
index 76dd265..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-citron b/source.local/x/x11/slack-desc/xf86-input-citron
deleted file mode 100644
index 5548268..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-digitaledge b/source.local/x/x11/slack-desc/xf86-input-digitaledge
deleted file mode 100644
index a199da4..0000000
--- a/source.local/x/x11/slack-desc/xf86-input-digitaledge
+++ /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-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:
diff --git a/source.local/x/x11/slack-desc/xf86-input-dmc b/source.local/x/x11/slack-desc/xf86-input-dmc
deleted file mode 100644
index 890f92e..0000000
--- a/source.local/x/x11/slack-desc/xf86-input-dmc
+++ /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-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:
diff --git a/source.local/x/x11/slack-desc/xf86-input-dynapro b/source.local/x/x11/slack-desc/xf86-input-dynapro
deleted file mode 100644
index 346eefe..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-elo2300 b/source.local/x/x11/slack-desc/xf86-input-elo2300
deleted file mode 100644
index 6c0bdd5..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-elographics b/source.local/x/x11/slack-desc/xf86-input-elographics
deleted file mode 100644
index 1e25656..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-evdev b/source.local/x/x11/slack-desc/xf86-input-evdev
index 0adcb02..93aeb3f 100644
--- a/source.local/x/x11/slack-desc/xf86-input-evdev
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-fpit b/source.local/x/x11/slack-desc/xf86-input-fpit
deleted file mode 100644
index 51ee433..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-hyperpen b/source.local/x/x11/slack-desc/xf86-input-hyperpen
deleted file mode 100644
index f6d6bda..0000000
--- a/source.local/x/x11/slack-desc/xf86-input-hyperpen
+++ /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-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:
diff --git a/source.local/x/x11/slack-desc/xf86-input-jamstudio b/source.local/x/x11/slack-desc/xf86-input-jamstudio
deleted file mode 100644
index 7042611..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-joystick b/source.local/x/x11/slack-desc/xf86-input-joystick
index 3a43a25..46963b8 100644
--- a/source.local/x/x11/slack-desc/xf86-input-joystick
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-keyboard b/source.local/x/x11/slack-desc/xf86-input-keyboard
index 640e2b5..e72beb4 100644
--- a/source.local/x/x11/slack-desc/xf86-input-keyboard
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-magellan b/source.local/x/x11/slack-desc/xf86-input-magellan
deleted file mode 100644
index 70ef438..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-magictouch b/source.local/x/x11/slack-desc/xf86-input-magictouch
deleted file mode 100644
index 72d02f5..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-microtouch b/source.local/x/x11/slack-desc/xf86-input-microtouch
deleted file mode 100644
index 412cb01..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-mouse b/source.local/x/x11/slack-desc/xf86-input-mouse
index 5ce1494..73bd88a 100644
--- a/source.local/x/x11/slack-desc/xf86-input-mouse
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-mutouch b/source.local/x/x11/slack-desc/xf86-input-mutouch
deleted file mode 100644
index 7c8c7f8..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-palmax b/source.local/x/x11/slack-desc/xf86-input-palmax
deleted file mode 100644
index 73328d7..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-penmount b/source.local/x/x11/slack-desc/xf86-input-penmount
index ca7e48b..9421878 100644
--- a/source.local/x/x11/slack-desc/xf86-input-penmount
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-spaceorb b/source.local/x/x11/slack-desc/xf86-input-spaceorb
deleted file mode 100644
index b127b89..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-summa b/source.local/x/x11/slack-desc/xf86-input-summa
deleted file mode 100644
index c69177b..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-synaptics b/source.local/x/x11/slack-desc/xf86-input-synaptics
index 2085840..1425e12 100644
--- a/source.local/x/x11/slack-desc/xf86-input-synaptics
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-tek4957 b/source.local/x/x11/slack-desc/xf86-input-tek4957
deleted file mode 100644
index 2e0a13f..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-ur98 b/source.local/x/x11/slack-desc/xf86-input-ur98
deleted file mode 100644
index 66680d8..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-input-vmmouse b/source.local/x/x11/slack-desc/xf86-input-vmmouse
index 640cc71..d563896 100644
--- a/source.local/x/x11/slack-desc/xf86-input-vmmouse
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-void b/source.local/x/x11/slack-desc/xf86-input-void
index 889017a..ef38f7d 100644
--- a/source.local/x/x11/slack-desc/xf86-input-void
+++ b/source.local/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.local/x/x11/slack-desc/xf86-input-wacom b/source.local/x/x11/slack-desc/xf86-input-wacom
index 88f68c1..86f4ca6 100644
--- a/source.local/x/x11/slack-desc/xf86-input-wacom
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-apm b/source.local/x/x11/slack-desc/xf86-video-apm
index b433ed1..2ee130c 100644
--- a/source.local/x/x11/slack-desc/xf86-video-apm
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-ark b/source.local/x/x11/slack-desc/xf86-video-ark
index 20abb22..eba356f 100644
--- a/source.local/x/x11/slack-desc/xf86-video-ark
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-armsoc b/source.local/x/x11/slack-desc/xf86-video-armsoc
new file mode 100644
index 0000000..41327f6
--- /dev/null
+++ b/source.local/x/x11/slack-desc/xf86-video-armsoc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+xf86-video-armsoc: xf86-video-armsoc (ARM SoC display driver)
+xf86-video-armsoc:
+xf86-video-armsoc: X.Org driver for ARM devices.
+xf86-video-armsoc:
+xf86-video-armsoc:
+xf86-video-armsoc:
+xf86-video-armsoc:
+xf86-video-armsoc:
+xf86-video-armsoc: See also:
+xf86-video-armsoc: http://git.chromium.org/gitweb/?a=project_list;pf=chromiumos
+xf86-video-armsoc:
diff --git a/source.local/x/x11/slack-desc/xf86-video-ast b/source.local/x/x11/slack-desc/xf86-video-ast
index 8861724..57efd5d 100644
--- a/source.local/x/x11/slack-desc/xf86-video-ast
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-ati b/source.local/x/x11/slack-desc/xf86-video-ati
index b6847e1..7387c43 100644
--- a/source.local/x/x11/slack-desc/xf86-video-ati
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-chips b/source.local/x/x11/slack-desc/xf86-video-chips
index 2422bc2..f615b79 100644
--- a/source.local/x/x11/slack-desc/xf86-video-chips
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-cirrus b/source.local/x/x11/slack-desc/xf86-video-cirrus
index f718881..ef65ecc 100644
--- a/source.local/x/x11/slack-desc/xf86-video-cirrus
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-cyrix b/source.local/x/x11/slack-desc/xf86-video-cyrix
deleted file mode 100644
index aebae00..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-dummy b/source.local/x/x11/slack-desc/xf86-video-dummy
index 389e9e3..98cac33 100644
--- a/source.local/x/x11/slack-desc/xf86-video-dummy
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-fbdev b/source.local/x/x11/slack-desc/xf86-video-fbdev
index ba6e4a6..08a636a 100644
--- a/source.local/x/x11/slack-desc/xf86-video-fbdev
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-geode b/source.local/x/x11/slack-desc/xf86-video-geode
index f965804..003286b 100644
--- a/source.local/x/x11/slack-desc/xf86-video-geode
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-glint b/source.local/x/x11/slack-desc/xf86-video-glint
index 32fb11c..7e4eeae 100644
--- a/source.local/x/x11/slack-desc/xf86-video-glint
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-i128 b/source.local/x/x11/slack-desc/xf86-video-i128
index bab5378..bbf2aa0 100644
--- a/source.local/x/x11/slack-desc/xf86-video-i128
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-i740 b/source.local/x/x11/slack-desc/xf86-video-i740
index e31e5ad..3b61c6a 100644
--- a/source.local/x/x11/slack-desc/xf86-video-i740
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-i810 b/source.local/x/x11/slack-desc/xf86-video-i810
deleted file mode 100644
index 99eb5b4..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-impact b/source.local/x/x11/slack-desc/xf86-video-impact
deleted file mode 100644
index 9990fc3..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-imstt b/source.local/x/x11/slack-desc/xf86-video-imstt
deleted file mode 100644
index 71614b6..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-intel b/source.local/x/x11/slack-desc/xf86-video-intel
index 55be1e3..c51417a 100644
--- a/source.local/x/x11/slack-desc/xf86-video-intel
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-mach64 b/source.local/x/x11/slack-desc/xf86-video-mach64
index ae70d09..46c7f7f 100644
--- a/source.local/x/x11/slack-desc/xf86-video-mach64
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-mga b/source.local/x/x11/slack-desc/xf86-video-mga
index e0df509..34e34e6 100644
--- a/source.local/x/x11/slack-desc/xf86-video-mga
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-modesetting b/source.local/x/x11/slack-desc/xf86-video-modesetting
new file mode 100644
index 0000000..d6ffe28
--- /dev/null
+++ b/source.local/x/x11/slack-desc/xf86-video-modesetting
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                      |-----handy-ruler------------------------------------------------------|
+xf86-video-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.local/x/x11/slack-desc/xf86-video-neomagic b/source.local/x/x11/slack-desc/xf86-video-neomagic
index 89676c2..862a430 100644
--- a/source.local/x/x11/slack-desc/xf86-video-neomagic
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-newport b/source.local/x/x11/slack-desc/xf86-video-newport
deleted file mode 100644
index 18d0daf..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-nouveau b/source.local/x/x11/slack-desc/xf86-video-nouveau
index 8697a60..ef20762 100644
--- a/source.local/x/x11/slack-desc/xf86-video-nouveau
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-nsc b/source.local/x/x11/slack-desc/xf86-video-nsc
deleted file mode 100644
index 1081a9f..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-nv b/source.local/x/x11/slack-desc/xf86-video-nv
index dfed510..cd86695 100644
--- a/source.local/x/x11/slack-desc/xf86-video-nv
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-openchrome b/source.local/x/x11/slack-desc/xf86-video-openchrome
index 263de31..32e4c31 100644
--- a/source.local/x/x11/slack-desc/xf86-video-openchrome
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-qxl b/source.local/x/x11/slack-desc/xf86-video-qxl
new file mode 100644
index 0000000..e5eae0c
--- /dev/null
+++ b/source.local/x/x11/slack-desc/xf86-video-qxl
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+xf86-video-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.local/x/x11/slack-desc/xf86-video-r128 b/source.local/x/x11/slack-desc/xf86-video-r128
index 6a5807b..ae700aa 100644
--- a/source.local/x/x11/slack-desc/xf86-video-r128
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-radeonhd b/source.local/x/x11/slack-desc/xf86-video-radeonhd
deleted file mode 100644
index ce2e726..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-rendition b/source.local/x/x11/slack-desc/xf86-video-rendition
index 99561b3..a4c4dac 100644
--- a/source.local/x/x11/slack-desc/xf86-video-rendition
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-s3 b/source.local/x/x11/slack-desc/xf86-video-s3
index f91fd6e..960fd1f 100644
--- a/source.local/x/x11/slack-desc/xf86-video-s3
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-s3virge b/source.local/x/x11/slack-desc/xf86-video-s3virge
index 52fe0a3..87042f4 100644
--- a/source.local/x/x11/slack-desc/xf86-video-s3virge
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-savage b/source.local/x/x11/slack-desc/xf86-video-savage
index f31d670..b789b63 100644
--- a/source.local/x/x11/slack-desc/xf86-video-savage
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-siliconmotion b/source.local/x/x11/slack-desc/xf86-video-siliconmotion
index 97a28f0..3a50a9a 100644
--- a/source.local/x/x11/slack-desc/xf86-video-siliconmotion
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-sis b/source.local/x/x11/slack-desc/xf86-video-sis
index d026175..f08c549 100644
--- a/source.local/x/x11/slack-desc/xf86-video-sis
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-sisusb b/source.local/x/x11/slack-desc/xf86-video-sisusb
index 9ab8bcb..bda16ac 100644
--- a/source.local/x/x11/slack-desc/xf86-video-sisusb
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-sunbw2 b/source.local/x/x11/slack-desc/xf86-video-sunbw2
deleted file mode 100644
index f432ae4..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-suncg14 b/source.local/x/x11/slack-desc/xf86-video-suncg14
deleted file mode 100644
index de038ed..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-suncg3 b/source.local/x/x11/slack-desc/xf86-video-suncg3
deleted file mode 100644
index c4b70a9..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-suncg6 b/source.local/x/x11/slack-desc/xf86-video-suncg6
deleted file mode 100644
index e9efb94..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-sunffb b/source.local/x/x11/slack-desc/xf86-video-sunffb
deleted file mode 100644
index 17400a0..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-sunleo b/source.local/x/x11/slack-desc/xf86-video-sunleo
deleted file mode 100644
index 03b0c2e..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-suntcx b/source.local/x/x11/slack-desc/xf86-video-suntcx
deleted file mode 100644
index 800bade..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-tdfx b/source.local/x/x11/slack-desc/xf86-video-tdfx
index 8d375ba..dddcaf5 100644
--- a/source.local/x/x11/slack-desc/xf86-video-tdfx
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-tga b/source.local/x/x11/slack-desc/xf86-video-tga
index 52a30eb..fead6cb 100644
--- a/source.local/x/x11/slack-desc/xf86-video-tga
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-trident b/source.local/x/x11/slack-desc/xf86-video-trident
index f4b6a57..6919727 100644
--- a/source.local/x/x11/slack-desc/xf86-video-trident
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-tseng b/source.local/x/x11/slack-desc/xf86-video-tseng
index 3192fe1..8e0a12b 100644
--- a/source.local/x/x11/slack-desc/xf86-video-tseng
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-v4l b/source.local/x/x11/slack-desc/xf86-video-v4l
index 27e7795..e6e1aab 100644
--- a/source.local/x/x11/slack-desc/xf86-video-v4l
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-vermilion b/source.local/x/x11/slack-desc/xf86-video-vermilion
deleted file mode 100644
index 2ca79f3..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-vesa b/source.local/x/x11/slack-desc/xf86-video-vesa
index 5a1edca..0c7e742 100644
--- a/source.local/x/x11/slack-desc/xf86-video-vesa
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-vga b/source.local/x/x11/slack-desc/xf86-video-vga
deleted file mode 100644
index 5a4dde6..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-via b/source.local/x/x11/slack-desc/xf86-video-via
deleted file mode 100644
index 9019318..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-vmware b/source.local/x/x11/slack-desc/xf86-video-vmware
index d3d818b..7ca2802 100644
--- a/source.local/x/x11/slack-desc/xf86-video-vmware
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-voodoo b/source.local/x/x11/slack-desc/xf86-video-voodoo
index 5ba59ab..357315d 100644
--- a/source.local/x/x11/slack-desc/xf86-video-voodoo
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-wsfb b/source.local/x/x11/slack-desc/xf86-video-wsfb
deleted file mode 100644
index 0253575..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86-video-xgi b/source.local/x/x11/slack-desc/xf86-video-xgi
index a92ec85..1792db1 100644
--- a/source.local/x/x11/slack-desc/xf86-video-xgi
+++ b/source.local/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.local/x/x11/slack-desc/xf86-video-xgixp b/source.local/x/x11/slack-desc/xf86-video-xgixp
index 32aea9f..6ba3359 100644
--- a/source.local/x/x11/slack-desc/xf86-video-xgixp
+++ b/source.local/x/x11/slack-desc/xf86-video-xgixp
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-video-xgixp: xf86-video-xgixp
+xf86-video-xgixp: xf86-video-xgixp (XGI XGI Volari 8300 video driver)
 xf86-video-xgixp:
 xf86-video-xgixp: xf86-video-xgixp is part of X11.
 xf86-video-xgixp:
diff --git a/source.local/x/x11/slack-desc/xf86bigfontproto b/source.local/x/x11/slack-desc/xf86bigfontproto
index d42c541..d9f1cc2 100644
--- a/source.local/x/x11/slack-desc/xf86bigfontproto
+++ b/source.local/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.local/x/x11/slack-desc/xf86dga b/source.local/x/x11/slack-desc/xf86dga
index 08c928a..70d189e 100644
--- a/source.local/x/x11/slack-desc/xf86dga
+++ b/source.local/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.local/x/x11/slack-desc/xf86dgaproto b/source.local/x/x11/slack-desc/xf86dgaproto
index c9ca3fc..cbc21ac 100644
--- a/source.local/x/x11/slack-desc/xf86dgaproto
+++ b/source.local/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.local/x/x11/slack-desc/xf86driproto b/source.local/x/x11/slack-desc/xf86driproto
index c327a43..e9466bd 100644
--- a/source.local/x/x11/slack-desc/xf86driproto
+++ b/source.local/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.local/x/x11/slack-desc/xf86miscproto b/source.local/x/x11/slack-desc/xf86miscproto
index 883ef9f..bf1297b 100644
--- a/source.local/x/x11/slack-desc/xf86miscproto
+++ b/source.local/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.local/x/x11/slack-desc/xf86rushproto b/source.local/x/x11/slack-desc/xf86rushproto
deleted file mode 100644
index 0013da9..0000000
--- a/source.local/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.local/x/x11/slack-desc/xf86vidmodeproto b/source.local/x/x11/slack-desc/xf86vidmodeproto
index 13acda8..2e6d8ea 100644
--- a/source.local/x/x11/slack-desc/xf86vidmodeproto
+++ b/source.local/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.local/x/x11/slack-desc/xfd b/source.local/x/x11/slack-desc/xfd
index 31f646f..4d47163 100644
--- a/source.local/x/x11/slack-desc/xfd
+++ b/source.local/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.local/x/x11/slack-desc/xfindproxy b/source.local/x/x11/slack-desc/xfindproxy
deleted file mode 100644
index 64125d2..0000000
--- a/source.local/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.local/x/x11/slack-desc/xfontsel b/source.local/x/x11/slack-desc/xfontsel
index cb4594c..0638c5e 100644
--- a/source.local/x/x11/slack-desc/xfontsel
+++ b/source.local/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.local/x/x11/slack-desc/xfs b/source.local/x/x11/slack-desc/xfs
index 33ea368..63d8766 100644
--- a/source.local/x/x11/slack-desc/xfs
+++ b/source.local/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.local/x/x11/slack-desc/xfsinfo b/source.local/x/x11/slack-desc/xfsinfo
index 87abf1e..85e5ef2 100644
--- a/source.local/x/x11/slack-desc/xfsinfo
+++ b/source.local/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.local/x/x11/slack-desc/xfwp b/source.local/x/x11/slack-desc/xfwp
deleted file mode 100644
index 572036c..0000000
--- a/source.local/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.local/x/x11/slack-desc/xgamma b/source.local/x/x11/slack-desc/xgamma
index 69df14a..c7ebcb9 100644
--- a/source.local/x/x11/slack-desc/xgamma
+++ b/source.local/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.local/x/x11/slack-desc/xgc b/source.local/x/x11/slack-desc/xgc
index 0de84bc..e07e9ba 100644
--- a/source.local/x/x11/slack-desc/xgc
+++ b/source.local/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.local/x/x11/slack-desc/xhost b/source.local/x/x11/slack-desc/xhost
index 53f9620..a4b9501 100644
--- a/source.local/x/x11/slack-desc/xhost
+++ b/source.local/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.local/x/x11/slack-desc/xineramaproto b/source.local/x/x11/slack-desc/xineramaproto
index dbdde80..6a39b1a 100644
--- a/source.local/x/x11/slack-desc/xineramaproto
+++ b/source.local/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.local/x/x11/slack-desc/xinit b/source.local/x/x11/slack-desc/xinit
index c1b0531..c64cd86 100644
--- a/source.local/x/x11/slack-desc/xinit
+++ b/source.local/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.local/x/x11/slack-desc/xinput b/source.local/x/x11/slack-desc/xinput
index 758a6ba..6ae25ae 100644
--- a/source.local/x/x11/slack-desc/xinput
+++ b/source.local/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.local/x/x11/slack-desc/xkbcomp b/source.local/x/x11/slack-desc/xkbcomp
index ab3fc9b..dc0da9b 100644
--- a/source.local/x/x11/slack-desc/xkbcomp
+++ b/source.local/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.local/x/x11/slack-desc/xkbdata b/source.local/x/x11/slack-desc/xkbdata
deleted file mode 100644
index 5fafad2..0000000
--- a/source.local/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.local/x/x11/slack-desc/xkbevd b/source.local/x/x11/slack-desc/xkbevd
index 9909e67..59b3f14 100644
--- a/source.local/x/x11/slack-desc/xkbevd
+++ b/source.local/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.local/x/x11/slack-desc/xkbprint b/source.local/x/x11/slack-desc/xkbprint
index efbe7ab..ab30d05 100644
--- a/source.local/x/x11/slack-desc/xkbprint
+++ b/source.local/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.local/x/x11/slack-desc/xkbutils b/source.local/x/x11/slack-desc/xkbutils
index 1e98d49..80f8ee9 100644
--- a/source.local/x/x11/slack-desc/xkbutils
+++ b/source.local/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.local/x/x11/slack-desc/xkeyboard-config b/source.local/x/x11/slack-desc/xkeyboard-config
index 3b9b0bb..0145425 100644
--- a/source.local/x/x11/slack-desc/xkeyboard-config
+++ b/source.local/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.local/x/x11/slack-desc/xkill b/source.local/x/x11/slack-desc/xkill
index 82aedb4..66904b4 100644
--- a/source.local/x/x11/slack-desc/xkill
+++ b/source.local/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.local/x/x11/slack-desc/xload b/source.local/x/x11/slack-desc/xload
index b95b6b6..24adeac 100644
--- a/source.local/x/x11/slack-desc/xload
+++ b/source.local/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.local/x/x11/slack-desc/xlogo b/source.local/x/x11/slack-desc/xlogo
index fbd28cc..e97b3e2 100644
--- a/source.local/x/x11/slack-desc/xlogo
+++ b/source.local/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.local/x/x11/slack-desc/xlsatoms b/source.local/x/x11/slack-desc/xlsatoms
index f4e7e79..c6e958a 100644
--- a/source.local/x/x11/slack-desc/xlsatoms
+++ b/source.local/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.local/x/x11/slack-desc/xlsclients b/source.local/x/x11/slack-desc/xlsclients
index 2bcf25f..2cf50b0 100644
--- a/source.local/x/x11/slack-desc/xlsclients
+++ b/source.local/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.local/x/x11/slack-desc/xlsfonts b/source.local/x/x11/slack-desc/xlsfonts
index 25e25af..d285ab0 100644
--- a/source.local/x/x11/slack-desc/xlsfonts
+++ b/source.local/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.local/x/x11/slack-desc/xmag b/source.local/x/x11/slack-desc/xmag
index 38174dd..50c329f 100644
--- a/source.local/x/x11/slack-desc/xmag
+++ b/source.local/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.local/x/x11/slack-desc/xman b/source.local/x/x11/slack-desc/xman
index 98ce929..206da5c 100644
--- a/source.local/x/x11/slack-desc/xman
+++ b/source.local/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.local/x/x11/slack-desc/xmessage b/source.local/x/x11/slack-desc/xmessage
index 12c9c0d..233d4aa 100644
--- a/source.local/x/x11/slack-desc/xmessage
+++ b/source.local/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.local/x/x11/slack-desc/xmh b/source.local/x/x11/slack-desc/xmh
index a1415c8..8730f1f 100644
--- a/source.local/x/x11/slack-desc/xmh
+++ b/source.local/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.local/x/x11/slack-desc/xmodmap b/source.local/x/x11/slack-desc/xmodmap
index aeb77cf..9397f1c 100644
--- a/source.local/x/x11/slack-desc/xmodmap
+++ b/source.local/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.local/x/x11/slack-desc/xmore b/source.local/x/x11/slack-desc/xmore
index a714db3..c8696b8 100644
--- a/source.local/x/x11/slack-desc/xmore
+++ b/source.local/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.local/x/x11/slack-desc/xorg-cf-files b/source.local/x/x11/slack-desc/xorg-cf-files
index a5f1578..343f503 100644
--- a/source.local/x/x11/slack-desc/xorg-cf-files
+++ b/source.local/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.local/x/x11/slack-desc/xorg-docs b/source.local/x/x11/slack-desc/xorg-docs
index aee2a99..dfe9e24 100644
--- a/source.local/x/x11/slack-desc/xorg-docs
+++ b/source.local/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.local/x/x11/slack-desc/xorg-server-xdmx b/source.local/x/x11/slack-desc/xorg-server-xdmx
deleted file mode 100644
index 0cfe5c8..0000000
--- a/source.local/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.local/x/x11/slack-desc/xorg-sgml-doctools b/source.local/x/x11/slack-desc/xorg-sgml-doctools
index 1467fb8..df86700 100644
--- a/source.local/x/x11/slack-desc/xorg-sgml-doctools
+++ b/source.local/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.local/x/x11/slack-desc/xphelloworld b/source.local/x/x11/slack-desc/xphelloworld
deleted file mode 100644
index e5ae0f3..0000000
--- a/source.local/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.local/x/x11/slack-desc/xplsprinters b/source.local/x/x11/slack-desc/xplsprinters
deleted file mode 100644
index b420159..0000000
--- a/source.local/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.local/x/x11/slack-desc/xpr b/source.local/x/x11/slack-desc/xpr
index 1e7795c..45936d4 100644
--- a/source.local/x/x11/slack-desc/xpr
+++ b/source.local/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.local/x/x11/slack-desc/xprehashprinterlist b/source.local/x/x11/slack-desc/xprehashprinterlist
deleted file mode 100644
index 3444a5e..0000000
--- a/source.local/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.local/x/x11/slack-desc/xprop b/source.local/x/x11/slack-desc/xprop
index 8996f50..9978872 100644
--- a/source.local/x/x11/slack-desc/xprop
+++ b/source.local/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.local/x/x11/slack-desc/xproto b/source.local/x/x11/slack-desc/xproto
index e57551a..1c230b1 100644
--- a/source.local/x/x11/slack-desc/xproto
+++ b/source.local/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.local/x/x11/slack-desc/xproxymanagementprotocol b/source.local/x/x11/slack-desc/xproxymanagementprotocol
deleted file mode 100644
index a5586dc..0000000
--- a/source.local/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.local/x/x11/slack-desc/xpyb b/source.local/x/x11/slack-desc/xpyb
index 92baab7..4d96cc2 100644
--- a/source.local/x/x11/slack-desc/xpyb
+++ b/source.local/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.local/x/x11/slack-desc/xrandr b/source.local/x/x11/slack-desc/xrandr
index 8f158dd..059fe1b 100644
--- a/source.local/x/x11/slack-desc/xrandr
+++ b/source.local/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.local/x/x11/slack-desc/xrdb b/source.local/x/x11/slack-desc/xrdb
index 26ea478..9adef97 100644
--- a/source.local/x/x11/slack-desc/xrdb
+++ b/source.local/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.local/x/x11/slack-desc/xrefresh b/source.local/x/x11/slack-desc/xrefresh
index 65e7140..f641dcf 100644
--- a/source.local/x/x11/slack-desc/xrefresh
+++ b/source.local/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.local/x/x11/slack-desc/xrx b/source.local/x/x11/slack-desc/xrx
deleted file mode 100644
index 3a6e369..0000000
--- a/source.local/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.local/x/x11/slack-desc/xscope b/source.local/x/x11/slack-desc/xscope
index 5008a74..a513cba 100644
--- a/source.local/x/x11/slack-desc/xscope
+++ b/source.local/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.local/x/x11/slack-desc/xset b/source.local/x/x11/slack-desc/xset
index e434079..da54a27 100644
--- a/source.local/x/x11/slack-desc/xset
+++ b/source.local/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.local/x/x11/slack-desc/xsetmode b/source.local/x/x11/slack-desc/xsetmode
deleted file mode 100644
index b727c3e..0000000
--- a/source.local/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.local/x/x11/slack-desc/xsetpointer b/source.local/x/x11/slack-desc/xsetpointer
deleted file mode 100644
index cbfaa0c..0000000
--- a/source.local/x/x11/slack-desc/xsetpointer
+++ /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------------------------------------------------------|
-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:
diff --git a/source.local/x/x11/slack-desc/xsetroot b/source.local/x/x11/slack-desc/xsetroot
index 8a9a4be..569396a 100644
--- a/source.local/x/x11/slack-desc/xsetroot
+++ b/source.local/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.local/x/x11/slack-desc/xsm b/source.local/x/x11/slack-desc/xsm
index 8fe6ba3..0034f32 100644
--- a/source.local/x/x11/slack-desc/xsm
+++ b/source.local/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.local/x/x11/slack-desc/xstdcmap b/source.local/x/x11/slack-desc/xstdcmap
index b1bd5e6..f659e75 100644
--- a/source.local/x/x11/slack-desc/xstdcmap
+++ b/source.local/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.local/x/x11/slack-desc/xtrans b/source.local/x/x11/slack-desc/xtrans
index f7ea71c..26c4866 100644
--- a/source.local/x/x11/slack-desc/xtrans
+++ b/source.local/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.local/x/x11/slack-desc/xtrap b/source.local/x/x11/slack-desc/xtrap
deleted file mode 100644
index bdf77e4..0000000
--- a/source.local/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.local/x/x11/slack-desc/xvidtune b/source.local/x/x11/slack-desc/xvidtune
index bdadf29..d55fae9 100644
--- a/source.local/x/x11/slack-desc/xvidtune
+++ b/source.local/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.local/x/x11/slack-desc/xvinfo b/source.local/x/x11/slack-desc/xvinfo
index 54a44c8..84f50e6 100644
--- a/source.local/x/x11/slack-desc/xvinfo
+++ b/source.local/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.local/x/x11/slack-desc/xwd b/source.local/x/x11/slack-desc/xwd
index 6b2450a..8230f33 100644
--- a/source.local/x/x11/slack-desc/xwd
+++ b/source.local/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.local/x/x11/slack-desc/xwininfo b/source.local/x/x11/slack-desc/xwininfo
index 03e11dd..9545fbf 100644
--- a/source.local/x/x11/slack-desc/xwininfo
+++ b/source.local/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.local/x/x11/slack-desc/xwud b/source.local/x/x11/slack-desc/xwud
index f0c22d3..6ae9086 100644
--- a/source.local/x/x11/slack-desc/xwud
+++ b/source.local/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.local/x/x11/src/get-xf86-video-nouveau.sh b/source.local/x/x11/src/get-xf86-video-nouveau.sh
index 72d3efd..9a21feb 100755
--- a/source.local/x/x11/src/get-xf86-video-nouveau.sh
+++ b/source.local/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.local/x/x11/x11.SlackBuild b/source.local/x/x11/x11.SlackBuild
index f6fb9fe..d3831a1 100755
--- a/source.local/x/x11/x11.SlackBuild
+++ b/source.local/x/x11/x11.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -19,7 +19,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 # To build only a single package group, specify it as $1, like:
@@ -28,6 +28,10 @@
 # and the name of the package, like:
 # ./x11.SlackBuild lib libX11
 
+# Upgrade packages as they are built.
+# This is default.  To not upgrade, pass UPGRADE_PACKAGES=no (or anything else).
+UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-yes}
+
 pkgbase() {
   PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
   case $PKGEXT in
@@ -54,18 +58,41 @@ pkgbase() {
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
 # A lot of this stuff just controls the package names this time:
 VERSION=${VERSION:-7.5}
 BUILD=${BUILD:-1}
@@ -125,9 +152,6 @@ no_usr_share_doc() {
   fi
 }
 
-# Set the compile options for the $ARCH being used:
-. $CWD/arch.use.flags
-
 SLACK_X_BUILD_DIR=$TMP/x11-build
 mkdir -p $SLACK_X_BUILD_DIR
 
@@ -135,7 +159,7 @@ mkdir -p $SLACK_X_BUILD_DIR
 # in the "magic order".  I built mine by hand through trial-and-error
 # before getting this script to work.  It wasn't that hard...  I think.  ;-)
 ( cd src
-  for x_source_dir in proto data util xcb lib app doc driver font xserver ; do
+  for x_source_dir in proto data util xcb lib app doc xserver driver font ; do
     # See if $1 is a source directory like "lib":
     if [ ! -z "$1" ]; then
       if [ ! "$1" = "${x_source_dir}" ]; then
@@ -274,6 +298,9 @@ mkdir -p $SLACK_X_BUILD_DIR
             BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
           else
             /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz
+            if [ "$UPGRADE_PACKAGES" = "yes" ]; then
+              /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz
+            fi
           fi
         fi
 
@@ -325,6 +352,9 @@ mkdir -p $SLACK_X_BUILD_DIR
         BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
       else
         /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
+        if [ "$UPGRADE_PACKAGES" = "yes" ]; then
+          /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
+        fi
       fi
     )
   done
diff --git a/source.local/xap/ddd/ddd.SlackBuild b/source.local/xap/ddd/ddd.SlackBuild
new file mode 100755
index 0000000..657875a
--- /dev/null
+++ b/source.local/xap/ddd/ddd.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+# Copyright 2013  Patrick J. Volkerding, Sebeka, Minnesota, 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.
+
+# Slackware build script for ddd
+# Written by Ferenc Deak <ferenc.deak@gmail.com>
+
+# Slight modifications by the SlackBuilds projects
+# Modified by Ken Milmore 2009
+
+PKGNAM=ddd
+VERSION=${VERSION:-3.3.12}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf  $CWD/$PKGNAM-$VERSION.tar.*z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+# http://savannah.gnu.org/bugs/?26726
+zcat $CWD/strclass.C.diff.gz | patch -p0 --verbose || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$TARGET
+
+make -j $NUMJOBS || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# DDD installs a .desktop file, but not an icon...
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/ddd.png > $PKG/usr/share/pixmaps/ddd.png
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* CREDITS NEWS PROBLEMS README TIPS TODO \
+  doc/html/ddd.html \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+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 $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xap/ddd/ddd.png b/source.local/xap/ddd/ddd.png
new file mode 100644
index 0000000..eec9b8c
--- /dev/null
+++ b/source.local/xap/ddd/ddd.png
diff --git a/source.local/xap/ddd/doinst.sh.gz b/source.local/xap/ddd/doinst.sh.gz
new file mode 100644
index 0000000..62bb097
--- /dev/null
+++ b/source.local/xap/ddd/doinst.sh.gz
diff --git a/source.local/xap/ddd/slack-desc b/source.local/xap/ddd/slack-desc
new file mode 100644
index 0000000..913884c
--- /dev/null
+++ b/source.local/xap/ddd/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 ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+ddd: ddd (Data Display Debugger)
+ddd:
+ddd: GNU DDD is a graphical front-end for command-line debuggers such as
+ddd: GDB, DBX, WDB, Ladebug, JDB, XDB, the Perl debugger, the bash
+ddd: debugger, or the Python debugger. Besides "usual" front-end features
+ddd: such as viewing source texts, DDD has become famous through its
+ddd: interactive graphical data display, where data structures are
+ddd: displayed as graphs.
+ddd:
+ddd:
+ddd:
diff --git a/source.local/xap/ddd/strclass.C.diff.gz b/source.local/xap/ddd/strclass.C.diff.gz
new file mode 100644
index 0000000..be808fa
--- /dev/null
+++ b/source.local/xap/ddd/strclass.C.diff.gz
diff --git a/source.local/xap/gimp/gimp.SlackBuild b/source.local/xap/gimp/gimp.SlackBuild
index 5c30bb4..caa61ec 100755
--- a/source.local/xap/gimp/gimp.SlackBuild
+++ b/source.local/xap/gimp/gimp.SlackBuild
@@ -20,42 +20,43 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
 
 
 PKGNAM=gimp
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.8.4}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -81,8 +82,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Other distros patch the Makefile, I just add LDFLAGS here:
-LDFLAGS="-lgobject-2.0 -lglib-2.0 -lm" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -93,8 +92,6 @@ CFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/gimp-$VERSION \
   --disable-static \
-  --enable-gimp-remote \
-  --without-gvfs \
   --with-libcurl \
   --build=$TARGET
 
@@ -105,10 +102,20 @@ make install DESTDIR=$PKG || exit 1
 # Add a manpage symlink for POLA-compliance
 ( cd $PKG/usr/man/man1 ; ln -sf gimptool-2.?.1 gimptool.1 )
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/usr/doc/gimp-$VERSION
 cp -a \
diff --git a/source.local/xap/network-manager-applet/doinst.sh.gz b/source.local/xap/network-manager-applet/doinst.sh.gz
new file mode 100644
index 0000000..a95b79e
--- /dev/null
+++ b/source.local/xap/network-manager-applet/doinst.sh.gz
diff --git a/source.local/xap/network-manager-applet/network-manager-applet.SlackBuild b/source.local/xap/network-manager-applet/network-manager-applet.SlackBuild
new file mode 100755
index 0000000..62d10fe
--- /dev/null
+++ b/source.local/xap/network-manager-applet/network-manager-applet.SlackBuild
@@ -0,0 +1,143 @@
+#!/bin/sh
+
+# Slackware build script for network-manager-applet
+
+# Copyright 2010, 2011  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.
+
+# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=network-manager-applet
+VERSION=${VERSION:-0.9.8.0}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+sed -i 's/GtkBox/GtkVBox/g' src/connection-editor/ce-page-general.ui
+sed -i 's/GtkBox/GtkVBox/g' src/connection-editor/nm-connection-editor.ui
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --with-gtkver=2 \
+  --disable-static \
+  --enable-more-warnings=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xap/network-manager-applet/slack-desc b/source.local/xap/network-manager-applet/slack-desc
new file mode 100644
index 0000000..ad8c8f7
--- /dev/null
+++ b/source.local/xap/network-manager-applet/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 ':'.
+
+                      |-----handy-ruler------------------------------------------------------|
+network-manager-applet: network-manager-applet (NetworkManager Applet)
+network-manager-applet:
+network-manager-applet: nm-applet is a gui frontend for NetworkManager.
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
diff --git a/source.local/xap/vim-gvim b/source.local/xap/vim-gvim
new file mode 120000
index 0000000..1a147f4
--- /dev/null
+++ b/source.local/xap/vim-gvim
@@ -0,0 +1 @@
+../ap/vim
\ No newline at end of file
diff --git a/source.local/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff.gz b/source.local/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff.gz
deleted file mode 100644
index 0cc588c..0000000
--- a/source.local/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz b/source.local/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz
deleted file mode 100644
index fc87b2b..0000000
--- a/source.local/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/mousepad-fix_find.diff.gz b/source.local/xap/xfce/patches/mousepad-fix_find.diff.gz
deleted file mode 100644
index a6a6ba6..0000000
--- a/source.local/xap/xfce/patches/mousepad-fix_find.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/mousepad-fix_find_and_replace.diff.gz b/source.local/xap/xfce/patches/mousepad-fix_find_and_replace.diff.gz
deleted file mode 100644
index 5c0d3b1..0000000
--- a/source.local/xap/xfce/patches/mousepad-fix_find_and_replace.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch.gz b/source.local/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch.gz
deleted file mode 100644
index 2a5c976..0000000
--- a/source.local/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff.gz b/source.local/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff.gz
deleted file mode 100644
index 837f2fb..0000000
--- a/source.local/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/xfcalendar.desktop.in.diff.gz b/source.local/xap/xfce/patches/xfcalendar.desktop.in.diff.gz
deleted file mode 100644
index 7529c4f..0000000
--- a/source.local/xap/xfce/patches/xfcalendar.desktop.in.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz b/source.local/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz
deleted file mode 100644
index f00a104..0000000
--- a/source.local/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff.gz b/source.local/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff.gz
deleted file mode 100644
index 7735841..0000000
--- a/source.local/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/xfdesktop-fix_education_icon.diff.gz b/source.local/xap/xfce/patches/xfdesktop-fix_education_icon.diff.gz
deleted file mode 100644
index 1910c76..0000000
--- a/source.local/xap/xfce/patches/xfdesktop-fix_education_icon.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz b/source.local/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz
deleted file mode 100644
index 318022c..0000000
--- a/source.local/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz
+++ /dev/null
diff --git a/source.local/xap/xfce/profile.d/xfce.csh b/source.local/xap/xfce/profile.d/xfce.csh
deleted file mode 100755
index ccc2b8f..0000000
--- a/source.local/xap/xfce/profile.d/xfce.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/csh
-if ( $?XDG_CONFIG_DIRS ) then
-    setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/xfce/xdg
-else
-    setenv XDG_CONFIG_DIRS /etc/xdg:/etc/xfce/xdg
-endif
diff --git a/source.local/xap/xfce/profile.d/xfce.sh b/source.local/xap/xfce/profile.d/xfce.sh
deleted file mode 100755
index adb187c..0000000
--- a/source.local/xap/xfce/profile.d/xfce.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
-  XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/xfce/xdg
-else
-  XDG_CONFIG_DIRS=/etc/xdg:/etc/xfce/xdg
-fi
-export XDG_CONFIG_DIRS
diff --git a/source.local/xap/xfce/slack-desc b/source.local/xap/xfce/slack-desc
deleted file mode 100644
index ecedf01..0000000
--- a/source.local/xap/xfce/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------------------------------------------------------|
-xfce: xfce (a fast and lightweight desktop environment for X)
-xfce:
-xfce: Xfce is a fast and lightweight desktop environment that is both
-xfce: visually appealing and easy to use.
-xfce:
-xfce: For more information, see:  http://www.xfce.org
-xfce:
-xfce: Xfce was developed by Olivier Fourdan.
-xfce:
-xfce:
-xfce:
diff --git a/source.local/xap/xfce/xfce.SlackBuild b/source.local/xap/xfce/xfce.SlackBuild
deleted file mode 100755
index ac3683b..0000000
--- a/source.local/xap/xfce/xfce.SlackBuild
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/bin/sh
-
-# Copyright 2003  Slackware Linux, Inc., Concord, CA, USA
-# Copyright 2007, 2008, 2009, 2010, 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.
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
-VERSION=4.6.2
-BUILD=${BUILD:-5}
-
-# A few tarballs have different versions; handle them here
-XDT_VERS=4.8.0		# xfce4-dev-tools version
-# We're going to ship xdt from xfce-4.8 since it's not used for building
-# release tarballs anyway, but it's handy to have around for building from 
-# git, and some folks might want to do that later...
-EXO_VERS=0.3.107	# exo version
-THUNAR_VERS=1.0.2	# thunar version
-GXE_VERS=2.6.0		# gtk-xfce-engine version
-TERM_VERS=0.4.6		# terminal version
-MPAD_VERS=0.2.16	# mousepad version
-XFWM_VERS=4.6.2		# xfwm4 version
-XFWMTHEME_VERS=4.6.0	# xfwm4-themes version
-SETTINGS_VERS=4.6.5	# xfce4-settings version
-SESSION_VERS=4.6.2	# xfce4-settings version
-PANEL_VERS=4.6.4	# xfce4-panel version
-XFCEGUI_VERS=4.6.4	# libxfcegui4 version
-XFCEMENU_VERS=4.6.2	# libxfce4menu version
-LIBUTIL_VERS=4.6.2	# libxfce4util version
-UTILS_VERS=4.6.2	# xfce-utils version
-APPFINDER_VERS=4.6.2	# xfce4-appfinder version
-XFCONF_VERS=4.6.2	# xfconf version
-XFDESKTOP_VERS=4.6.2	# xfdesktop version
-MIXER_VERS=4.6.1	# xfce4-mixer version
-XFPRINT_VERS=4.6.1	# xfprint version
-ORAGE_VERS=4.6.1	# orage version
-
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  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"
-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/xfce-build-dir}
-PKG=$TMP/package-xfce
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP || exit 1
-
-COMPRESSION=xz
-COMPRESSUTIL=xz
-
-for file in \
- xfce4-dev-tools-$XDT_VERS.tar.$COMPRESSION \
- libxfce4util-$LIBUTIL_VERS.tar.$COMPRESSION \
- xfconf-$XFCONF_VERS.tar.$COMPRESSION \
- libxfcegui4-$XFCEGUI_VERS.tar.$COMPRESSION \
- libxfce4menu-$XFCEMENU_VERS.tar.$COMPRESSION \
- exo-$EXO_VERS.tar.$COMPRESSION \
- xfce4-panel-$PANEL_VERS.tar.$COMPRESSION \
- Thunar-$THUNAR_VERS.tar.$COMPRESSION \
- xfce4-settings-$SETTINGS_VERS.tar.$COMPRESSION \
- xfce4-session-$SESSION_VERS.tar.$COMPRESSION \
- xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION \
- xfwm4-$XFWM_VERS.tar.$COMPRESSION \
- xfce-utils-$UTILS_VERS.tar.$COMPRESSION \
- xfce4-mixer-$MIXER_VERS.tar.$COMPRESSION \
- xfprint-$XFPRINT_VERS.tar.$COMPRESSION \
- xfce4-appfinder-$APPFINDER_VERS.tar.$COMPRESSION \
- gtk-xfce-engine-$GXE_VERS.tar.$COMPRESSION \
- Terminal-$TERM_VERS.tar.$COMPRESSION \
- xfwm4-themes-$XFWMTHEME_VERS.tar.$COMPRESSION \
- mousepad-$MPAD_VERS.tar.$COMPRESSION \
- orage-$ORAGE_VERS.tar.$COMPRESSION ;
-do
-  $COMPRESSUTIL -dc $CWD/src/$file | tar xvf - || exit 1
-  cd $(basename $file .tar.$COMPRESSION) || 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 {} \;
-  
-    # Here's where we patch or set up any other package-specific stuff:
-      # Patch to only show xfcalendar in XFce (otherwise it shows up in
-      # KDE's Lost & Found and does not work):
-      if [ "$file" = "orage-$ORAGE_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/xfcalendar.desktop.in.diff.gz | patch -p1 --verbose || exit 1
-      fi
-      # Make Thunar respect --docdir
-      if [ "$file" = "Thunar-$THUNAR_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/thunar-1.0.2-fixup_docdir.diff.gz | patch -p1 --verbose || exit 1
-        zcat $CWD/patches/Thunar.thunar-vfs-io-local.diff.gz | patch -p0 --verbose || exit 1
-      fi
-      # Fix the missing education icon in the desktop menu
-      if [ "$file" = "xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/xfdesktop-fix_education_icon.diff.gz | patch -p1 --verbose || exit 1
-      fi
-      # 1) Launch xfce through consolekit so that ck enabled stuff works in xfce
-      # 2) Fix comments in /etc/xfce/xdg/xfce4/Xft.xrdb 
-      #    http://bugzilla.xfce.org/show_bug.cgi?id=6314
-      # 3) Load system-wide .Xmodmap, not just the one in $HOME
-      if [ "$file" = "xfce-utils-$UTILS_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/xfce-utils.xinitrc.consolekit.diff.gz | patch -p1 --verbose || exit 1
-        zcat $CWD/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz | patch -p1 --verbose || exit 1
-        zcat $CWD/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz | patch -p1 --verbose || exit 1
-      fi
-      # Fix a couple of bugs from mousepad git
-      if [ "$file" = "mousepad-$MPAD_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/mousepad-fix_find_and_replace.diff.gz | patch -p1 --verbose || exit 1
-        zcat $CWD/patches/mousepad-fix_find.diff.gz | patch -p1 --verbose || exit 1
-      fi
-      # Fix a plugin moving bug in the panel
-      if [ "$file" = "xfce4-panel-$PANEL_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/no_sensitive_panel_during_plugin_moves.patch.gz | patch -p1 --verbose || exit 1
-      fi
-      # Start kde4 services instead of kde3
-      # http://bugzilla.xfce.org/show_bug.cgi?id=7382
-      if [ "$file" = "xfce4-session-$SESSION_VERS.tar.$COMPRESSION" ]; then
-        zcat $CWD/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz | patch -p1 --verbose || exit 1
-      fi
-    # End patches/package-specific stuff
-
-    CFLAGS="$SLKCFLAGS" \
-    CXXFLAGS="$SLKCFLAGS" \
-    ./configure \
-      --prefix=/usr \
-      --libdir=/usr/lib${LIBDIRSUFFIX} \
-      --sysconfdir=/etc/xfce \
-      --mandir=/usr/man \
-      --docdir=/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) \
-      --htmldir=/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION)/html \
-      --disable-static \
-      --build=$TARGET \
-      $PACKAGE_SPECIFIC_OPTIONS
-  
-    # Unset this now -- we're done with it
-    unset PACKAGE_SPECIFIC_OPTIONS
-  
-    make $NUMJOBS || make || exit 1
-    make install || exit 1
-    make install DESTDIR=$PKG
-  
-    mkdir -p $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION)
-    # This will cause errors, but won't miss any docs:
-    cp -a \
-      AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
-      NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
-     $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) \
-     2> /dev/null || true
-
-    # 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/xfce-$VERSION/$(basename $file .tar.$COMPRESSION))
-      cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-      touch -r ChangeLog $DOCSDIR/ChangeLog
-    fi
-
-  cd - ;
-done
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# The Rodent icon theme isn't xdg compliant, so it spews errors quite often
-# and just flat breaks some things here and there, so the Xfce team elected
-# not to ship it with 4.6.x.   In the meantime, we'll default to gnome.
-sed -i s/Rodent/gnome/ \
-  $PKG/etc/xfce/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-
-# We're going to borrow the "applications-education" icons (six of them)
-# from the kde oxygen icon theme (it's LGPL)
-tar xf $CWD/icons.tar.xz -C $PKG/usr/share
-
-# We don't want any of those icon caches
-find $PKG/usr/share/icons -type f -name "index-theme.cache" -exec rm -f {} \;
-
-# Compress and if needed symlink the man pages:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-mkdir -p $PKG/etc/profile.d
-cp -a $CWD/profile.d/* $PKG/etc/profile.d
-chown root:root $PKG/etc/profile.d/*
-chmod 755 $PKG/etc/profile.d/*
-
-mkdir -p $PKG/etc/X11/xinit
-( cd $PKG/etc/X11/xinit
-  ln -sf ../../xfce/xdg/xfce4/xinitrc xinitrc.xfce
-  chmod 755 ../../xfce/xdg/xfce4/xinitrc
-)
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/xfce-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source.local/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source.local/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild
deleted file mode 100755
index 42d0ec0..0000000
--- a/source.local/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Xfce4-notifyd
-
-# Copyright 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2010  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.
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
-PKGNAM=xfce4-notifyd
-VERSION=${VERSION:-0.1.1}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-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"
-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
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-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 \) \
- -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" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/xfce \
-  --localstatedir=/var \
-  --enable-debug=no \
-  --build=$TARGET
-
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-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/${PKGNAM}-$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
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source.local/xap/xfce4-power-manager/doinst.sh.gz b/source.local/xap/xfce4-power-manager/doinst.sh.gz
deleted file mode 100644
index 6e9c49b..0000000
--- a/source.local/xap/xfce4-power-manager/doinst.sh.gz
+++ /dev/null
diff --git a/source.local/xap/xfce4-power-manager/slack-desc b/source.local/xap/xfce4-power-manager/slack-desc
deleted file mode 100644
index d1dd7ec..0000000
--- a/source.local/xap/xfce4-power-manager/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------------------------------------------------|
-xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce)
-xfce4-power-manager:
-xfce4-power-manager: xfce4-power-manager makes power management functions (such as
-xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment
-xfce4-power-manager: (but it should also work in any other desktop environment).
-xfce4-power-manager:
-xfce4-power-manager:
-xfce4-power-manager:
-xfce4-power-manager:
-xfce4-power-manager:
-xfce4-power-manager:
diff --git a/source.local/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source.local/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild
deleted file mode 100755
index c884510..0000000
--- a/source.local/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for xfce4-power-manager
-
-# Copyright 2006-2010  Robby Workman  Northport, Alabama, USA
-# Copyright 2009, 2010  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.
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
-PKGNAM=xfce4-power-manager
-VERSION=${VERSION:-0.8.5}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-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"
-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
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP || 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 \) \
- -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" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/xfce \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --enable-shared=yes \
-  --enable-static=no \
-  --enable-debug=no \
-  --disable-network-manager \
-  --build=$TARGET
-
-make || exit 1
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-gzip -9 $PKG/usr/man/man?/*.?
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
-cp -a \
-  AUTHORS COPYING NEWS README TODO \
-    $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION/html
-  ln -s /usr/share/xfce4/doc/C/xfce4-power-manager.html index.html
-  ln -s /usr/share/xfce4/doc/C/images .
-)
-
-# 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/${PKGNAM}-$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
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source.local/xap/xxgdb/slack-desc b/source.local/xap/xxgdb/slack-desc
deleted file mode 100644
index 4905df8..0000000
--- a/source.local/xap/xxgdb/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------------------------------------------------------|
-xxgdb: xxgdb (graphical program debugger interface)
-xxgdb:
-xxgdb: Xxgdb is a graphical user interface to the gdb debugger under the X
-xxgdb: Window System.  It provides visual feedback and mouse input for the
-xxgdb: user to control program execution through breakpoints, to examine and
-xxgdb: traverse the function call stack, and to display values of variables
-xxgdb: and data structures.
-xxgdb:
-xxgdb:
-xxgdb:
-xxgdb:
diff --git a/source.local/xap/xxgdb/xxgdb-1.08-glibc.patch.xz b/source.local/xap/xxgdb/xxgdb-1.08-glibc.patch.xz
deleted file mode 100644
index c686084..0000000
--- a/source.local/xap/xxgdb/xxgdb-1.08-glibc.patch.xz
+++ /dev/null
diff --git a/source.local/xap/xxgdb/xxgdb-1.12-debian-filemenu.patch.xz b/source.local/xap/xxgdb/xxgdb-1.12-debian-filemenu.patch.xz
deleted file mode 100644
index cce3846..0000000
--- a/source.local/xap/xxgdb/xxgdb-1.12-debian-filemenu.patch.xz
+++ /dev/null
diff --git a/source.local/xap/xxgdb/xxgdb-1.12-debian-pty.patch.xz b/source.local/xap/xxgdb/xxgdb-1.12-debian-pty.patch.xz
deleted file mode 100644
index 758292b..0000000
--- a/source.local/xap/xxgdb/xxgdb-1.12-debian-pty.patch.xz
+++ /dev/null
diff --git a/source.local/xap/xxgdb/xxgdb-1.12-mandriva.patch.xz b/source.local/xap/xxgdb/xxgdb-1.12-mandriva.patch.xz
deleted file mode 100644
index 0f4172b..0000000
--- a/source.local/xap/xxgdb/xxgdb-1.12-mandriva.patch.xz
+++ /dev/null
diff --git a/source.local/xap/xxgdb/xxgdb-1.12-sysv.patch.xz b/source.local/xap/xxgdb/xxgdb-1.12-sysv.patch.xz
deleted file mode 100644
index 1efcb75..0000000
--- a/source.local/xap/xxgdb/xxgdb-1.12-sysv.patch.xz
+++ /dev/null
diff --git a/source.local/xap/xxgdb/xxgdb.SlackBuild b/source.local/xap/xxgdb/xxgdb.SlackBuild
deleted file mode 100755
index d2c7d79..0000000
--- a/source.local/xap/xxgdb/xxgdb.SlackBuild
+++ /dev/null
@@ -1,127 +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.
-#
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-
-PKGNAM=xxgdb
-VERSION=${VERSION:-1.12}
-BUILD=${BUILD:-3}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  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=$MARCH ;;
-  esac
-fi
-
-# Set compile flags:
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-else
-  SLKCFLAGS="-O2"
-fi
-
-# Extract source:
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
-cd ${PKGNAM}-$VERSION || exit 1
-
-# Apply patches:
-# The patches were taken from Mandriva's SRPM and address build issues
-# and run-time issues on x86_64. 
-for pf in $CWD/*patch.xz ; do
-  { xz -dc $pf | patch -p1 ;} || exit 1
-done
-
-# Make sure ownerships and permissions are sane:
-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 {} \;
-
-xmkmf || exit 1
-make CCOPTIONS="$SLKCFLAGS" || exit 1
-make install DESTDIR="$PKG"
-make install.man DESTDIR="$PKG"
-
-# 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
-
-# Compress and link manpages, if any:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.*
-      )
-    done
-  )
-fi
-
-# Compress info files, if any:
-if [ -d $PKG/usr/info ]; then
-  ( cd $PKG/usr/info
-    rm -f dir
-    gzip -9 *
-  )
-fi
-
-# Add a documentation directory:
-mkdir -p ${PKG}/usr/doc/${PKGNAM}-$VERSION
-cp -a \
-  *README* XDbx.NEW_INTERFACE \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source.local/xfce/Thunar/Thunar.SlackBuild b/source.local/xfce/Thunar/Thunar.SlackBuild
new file mode 100755
index 0000000..07f6307
--- /dev/null
+++ b/source.local/xfce/Thunar/Thunar.SlackBuild
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=Thunar
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+find . -exec touch {} \;
+
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source.local/xfce/Thunar/slack-desc b/source.local/xfce/Thunar/slack-desc
new file mode 100644
index 0000000..afd93c0
--- /dev/null
+++ b/source.local/xfce/Thunar/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 ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+Thunar: Thunar (file manager)
+Thunar:
+Thunar: Thunar is a modern file manager for the Xfce Desktop Environment.
+Thunar: Thunar has been designed from the ground up to be fast and
+Thunar: easy-to-use.  Its user interface is clean and intuitive, and does not
+Thunar: include any confusing or useless options.  Thunar is fast and
+Thunar: responsive with a good start up time and directory load time.
+Thunar:
+Thunar: Homepage:  http://thunar.xfce.org
+Thunar:
+Thunar:
diff --git a/source.local/xfce/XFCE.SlackBuild b/source.local/xfce/XFCE.SlackBuild
new file mode 120000
index 0000000..84ce919
--- /dev/null
+++ b/source.local/xfce/XFCE.SlackBuild
@@ -0,0 +1 @@
+xfce-build-all.sh
\ No newline at end of file
diff --git a/source.local/xfce/exo/exo.SlackBuild b/source.local/xfce/exo/exo.SlackBuild
new file mode 100755
index 0000000..66f26c4
--- /dev/null
+++ b/source.local/xfce/exo/exo.SlackBuild
@@ -0,0 +1,147 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=exo
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+find . -exec touch {} \;
+
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/exo/slack-desc b/source.local/xfce/exo/slack-desc
new file mode 100644
index 0000000..6bd9c82
--- /dev/null
+++ b/source.local/xfce/exo/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 ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+exo: exo (libexo extension library)
+exo:
+exo: This is libexo, an extension library to Xfce, developed by
+exo: os-cillation.  While Xfce comes with quite a few libraries that are
+exo: targeted at desktop development, libexo is targeted at application
+exo: development.  It also has some helper applications that are used
+exo: throughout the entire desktop.
+exo:
+exo: 
+exo:
+exo:
diff --git a/source.local/xfce/garcon/garcon.SlackBuild b/source.local/xfce/garcon/garcon.SlackBuild
new file mode 100755
index 0000000..9f161a8
--- /dev/null
+++ b/source.local/xfce/garcon/garcon.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=garcon
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/garcon/slack-desc b/source.local/xfce/garcon/slack-desc
new file mode 100644
index 0000000..abc2d78
--- /dev/null
+++ b/source.local/xfce/garcon/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 ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+garcon: garcon (menu implementation for Xfce)
+garcon:
+garcon: This is garcon, a freedesktop.org compliant menu implementation based
+garcon: on GLib and GIO.  It was started as a rewrite of the former Xfce menu
+garcon: library called libxfce4menu.
+garcon:
+garcon:
+garcon:
+garcon:
+garcon:
+garcon:
diff --git a/source.local/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild b/source.local/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild
new file mode 100755
index 0000000..5c70718
--- /dev/null
+++ b/source.local/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=gtk-xfce-engine
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/gtk-xfce-engine/slack-desc b/source.local/xfce/gtk-xfce-engine/slack-desc
new file mode 100644
index 0000000..1ccfa12
--- /dev/null
+++ b/source.local/xfce/gtk-xfce-engine/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 ':'.
+
+               |-----handy-ruler------------------------------------------------------|
+gtk-xfce-engine: gtk-xfce-engine (Xfce Gtk+ engines)
+gtk-xfce-engine:
+gtk-xfce-engine: The GTK-Xfce-Engine package contains several GTK+-2/3 themes and the
+gtk-xfce-engine: applications and libraries needed to display them.  This is useful for
+gtk-xfce-engine: customizing the appearance of your Xfce desktop.
+gtk-xfce-engine:
+gtk-xfce-engine:
+gtk-xfce-engine:
+gtk-xfce-engine:
+gtk-xfce-engine:
+gtk-xfce-engine:
diff --git a/source.local/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source.local/xfce/libxfce4ui/libxfce4ui.SlackBuild
new file mode 100755
index 0000000..4c1c93f
--- /dev/null
+++ b/source.local/xfce/libxfce4ui/libxfce4ui.SlackBuild
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=libxfce4ui
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --with-vendor-info=Slackware \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Add vendor info in /usr/share/xfce4/Slackware
+mkdir -p $PKG/usr/share/xfce4
+echo "http://slackware.com/" > $PKG/usr/share/xfce4/Slackware
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/libxfce4ui/slack-desc b/source.local/xfce/libxfce4ui/slack-desc
new file mode 100644
index 0000000..d774e67
--- /dev/null
+++ b/source.local/xfce/libxfce4ui/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 ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+libxfce4ui: libxfce4ui (Xfce widget library)
+libxfce4ui:
+libxfce4ui: This is libxfce4ui, the replacement of the old libxfcegui4 library.
+libxfce4ui: It is used to share commonly used Xfce widgets among the Xfce
+libxfce4ui: applications.
+libxfce4ui:
+libxfce4ui:
+libxfce4ui:
+libxfce4ui:
+libxfce4ui:
+libxfce4ui:
diff --git a/source.local/xfce/libxfce4util/libxfce4util.SlackBuild b/source.local/xfce/libxfce4util/libxfce4util.SlackBuild
new file mode 100755
index 0000000..d74d4e1
--- /dev/null
+++ b/source.local/xfce/libxfce4util/libxfce4util.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=libxfce4util
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/libxfce4util/slack-desc b/source.local/xfce/libxfce4util/slack-desc
new file mode 100644
index 0000000..b5c9259
--- /dev/null
+++ b/source.local/xfce/libxfce4util/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 ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+libxfce4util: libxfce4util (basic utility library for Xfce)
+libxfce4util:
+libxfce4util: Basic utility library for Xfce.  This provides useful functions not
+libxfce4util: relating to the handling of the user interface.
+libxfce4util: 
+libxfce4util:
+libxfce4util:
+libxfce4util:
+libxfce4util:
+libxfce4util:
+libxfce4util:
diff --git a/source.local/xfce/libxfcegui4/libxfcegui4.SlackBuild b/source.local/xfce/libxfcegui4/libxfcegui4.SlackBuild
new file mode 100755
index 0000000..1c36591
--- /dev/null
+++ b/source.local/xfce/libxfcegui4/libxfcegui4.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=libxfcegui4
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/libxfcegui4/slack-desc b/source.local/xfce/libxfcegui4/slack-desc
new file mode 100644
index 0000000..8309460
--- /dev/null
+++ b/source.local/xfce/libxfcegui4/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 ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+libxfcegui4: libxfcegui4 (old Xfce widget library)
+libxfcegui4:
+libxfcegui4: This is a widget library for Xfce.  It has been replaced by the use
+libxfcegui4: of the libxfce4ui library, but older programs might still need it.
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
diff --git a/source.local/xfce/orage/orage.SlackBuild b/source.local/xfce/orage/orage.SlackBuild
new file mode 100755
index 0000000..a2c1ba1
--- /dev/null
+++ b/source.local/xfce/orage/orage.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Slackware build script for orage
+
+# Copyright 2010,2011,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.
+
+PKGNAM=orage
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Yes, libical's pkgconfig file is incomplete, it seems
+CFLAGS="$SLKCFLAGS -I/usr/include/libical" \
+CXXFLAGS="$SLKCFLAGS -I/usr/include/libical" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/orage/slack-desc b/source.local/xfce/orage/slack-desc
new file mode 100644
index 0000000..665765d
--- /dev/null
+++ b/source.local/xfce/orage/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 ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+orage: orage (Xfce's calendar)
+orage:
+orage: Orage is a time-managing application for the Xfce desktop environment.
+orage:
+orage:
+orage:
+orage:
+orage:
+orage:
+orage:
+orage:
diff --git a/source.local/xfce/thunar-volman/slack-desc b/source.local/xfce/thunar-volman/slack-desc
new file mode 100644
index 0000000..900d22a
--- /dev/null
+++ b/source.local/xfce/thunar-volman/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 ':'.
+
+             |-----handy-ruler------------------------------------------------|
+thunar-volman: thunar-volman (Thunar Volume Manager Plugin)
+thunar-volman: 
+thunar-volman: thunar-volman is an extension for the Thunar File Manager, 
+thunar-volman: which enables automatic management of removable drives and 
+thunar-volman: media. 
+thunar-volman: 
+thunar-volman: 
+thunar-volman: 
+thunar-volman: 
+thunar-volman: 
+thunar-volman: 
diff --git a/source.local/xfce/thunar-volman/thunar-volman.SlackBuild b/source.local/xfce/thunar-volman/thunar-volman.SlackBuild
new file mode 100755
index 0000000..06ad1f6
--- /dev/null
+++ b/source.local/xfce/thunar-volman/thunar-volman.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Slackware build script for thunar-volman
+
+# Copyright 2007-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.
+
+
+PKGNAM=thunar-volman
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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} \
+  --enable-debug=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/tumbler/set-gststate-on-error.diff.gz b/source.local/xfce/tumbler/set-gststate-on-error.diff.gz
new file mode 100644
index 0000000..1955941
--- /dev/null
+++ b/source.local/xfce/tumbler/set-gststate-on-error.diff.gz
diff --git a/source.local/xfce/tumbler/slack-desc b/source.local/xfce/tumbler/slack-desc
new file mode 100644
index 0000000..d40670e
--- /dev/null
+++ b/source.local/xfce/tumbler/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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+tumbler: tumbler (thumbnail generator)
+tumbler:
+tumbler: Tumbler is a D-Bus service for applications to request thumbnails
+tumbler: for various URI schemes and MIME types. It is written in an object-
+tumbler: oriented fashion using GLib and GObject.  It provides plugin
+tumbler: interfaces for extending the URI schemes and MIME types for which
+tumbler: thumbnails can be generated as well as for replacing the storage
+tumbler: backend that is used to store the thumbnails on disk. 
+tumbler:
+tumbler:
+tumbler:
diff --git a/source.local/xfce/tumbler/tumbler.SlackBuild b/source.local/xfce/tumbler/tumbler.SlackBuild
new file mode 100755
index 0000000..781a5af
--- /dev/null
+++ b/source.local/xfce/tumbler/tumbler.SlackBuild
@@ -0,0 +1,147 @@
+#!/bin/sh
+
+# Copyright 2012, 2013  Patrick J. Volkerding, Sebeka, Minnesota, 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=tumbler
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/set-gststate-on-error.diff.gz | patch -p1 --verbose || 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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce-build-all.sh b/source.local/xfce/xfce-build-all.sh
new file mode 100755
index 0000000..dec432f
--- /dev/null
+++ b/source.local/xfce/xfce-build-all.sh
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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.
+
+# Set to 1 if you'd like to install/upgrade package as they are built.
+# This is recommended.
+INST=1
+
+TMP=${TMP:-/tmp}
+
+for package in \
+  xfce4-dev-tools \
+  libxfce4util \
+  xfconf \
+  libxfce4ui \
+  libxfcegui4 \
+  exo \
+  garcon \
+  tumbler \
+  Thunar \
+  xfce4-panel \
+  Thunar \
+  xfce4-settings \
+  xfce4-session \
+  xfdesktop \
+  xfwm4 \
+  xfce4-appfinder \
+  gtk-xfce-engine \
+  xfwm4-themes \
+  xfce4-terminal \
+  orage \
+  xfce4-mixer \
+  thunar-volman \
+  xfce4-power-manager \
+  xfce4-notifyd \
+  xfce4-volumed \
+  xfce4-clipman-plugin \
+  xfce4-screenshooter \
+  xfce4-systemload-plugin \
+  xfce4-taskmanager \
+  xfce4-weather-plugin \
+  ; do
+  cd $package || exit 1
+  ./${package}.SlackBuild || ( touch /tmp/${package}.failed ; exit 1 ) || exit 1
+  if [ "$INST" = "1" ]; then
+    PACKAGE="$(ls -t $TMP/$(ls ${package}*.xz | rev | cut -f2- -d - | rev)-*txz | head -n 1)"
+    if [ -f $PACKAGE ]; then
+      upgradepkg --install-new --reinstall $PACKAGE
+    else
+      echo "Error:  package to upgrade "$PACKAGE" not found in $TMP"
+      exit 1
+    fi
+  fi
+  cd ..
+done
diff --git a/source.local/xfce/xfce4-appfinder/slack-desc b/source.local/xfce/xfce4-appfinder/slack-desc
new file mode 100644
index 0000000..ef06f70
--- /dev/null
+++ b/source.local/xfce/xfce4-appfinder/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 ':'.
+
+               |-----handy-ruler------------------------------------------------------|
+xfce4-appfinder: xfce4-appfinder (Application finder)
+xfce4-appfinder:
+xfce4-appfinder: The Xfce application finder is a tool to find and launch installed
+xfce4-appfinder: applications on your system and execute commands.  It can also be used
+xfce4-appfinder: to quickly add launchers to the Xfce Panel by dragging an item from
+xfce4-appfinder: the view and dropping it on the panel.
+xfce4-appfinder:
+xfce4-appfinder:
+xfce4-appfinder:
+xfce4-appfinder:
+xfce4-appfinder:
diff --git a/source.local/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild b/source.local/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
new file mode 100755
index 0000000..9aca44b
--- /dev/null
+++ b/source.local/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfce4-appfinder
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-clipman-plugin/doinst.sh.gz b/source.local/xfce/xfce4-clipman-plugin/doinst.sh.gz
new file mode 100644
index 0000000..453835c
--- /dev/null
+++ b/source.local/xfce/xfce4-clipman-plugin/doinst.sh.gz
diff --git a/source.local/xfce/xfce4-clipman-plugin/slack-desc b/source.local/xfce/xfce4-clipman-plugin/slack-desc
new file mode 100644
index 0000000..def9184
--- /dev/null
+++ b/source.local/xfce/xfce4-clipman-plugin/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 ':'.
+
+                    |-----handy-ruler------------------------------------------------------|
+xfce4-clipman-plugin: xfce4-clipman-plugin (clipman plugin for the Xfce panel)
+xfce4-clipman-plugin:
+xfce4-clipman-plugin: Clipman allows you to keep several clipboard selections in memory
+xfce4-clipman-plugin: which you can then use to toggle.  It can pull the clips from both
+xfce4-clipman-plugin: the selection and the copy buffer, restore your clipboard on login,
+xfce4-clipman-plugin: and prevent an empty clipboard.
+xfce4-clipman-plugin:
+xfce4-clipman-plugin:
+xfce4-clipman-plugin:
+xfce4-clipman-plugin:
+xfce4-clipman-plugin:
diff --git a/source.local/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild b/source.local/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild
new file mode 100755
index 0000000..7c89698
--- /dev/null
+++ b/source.local/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-clipman-plugin
+
+# Copyright 2006-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:
+#
+#  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=xfce4-clipman-plugin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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 \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-shared=yes \
+  --enable-static=no \
+  --enable-debug=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+    $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url b/source.local/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url
new file mode 100644
index 0000000..73b59ab
--- /dev/null
+++ b/source.local/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/
diff --git a/source.local/xfce/xfce4-dev-tools/slack-desc b/source.local/xfce/xfce4-dev-tools/slack-desc
new file mode 100644
index 0000000..a5d0a4d
--- /dev/null
+++ b/source.local/xfce/xfce4-dev-tools/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 ':'.
+
+               |-----handy-ruler------------------------------------------------------|
+xfce4-dev-tools: xfce4-dev-tools (Xfce development tools)
+xfce4-dev-tools:
+xfce4-dev-tools: The Xfce development tools are a collection of tools and macros for
+xfce4-dev-tools: Xfce developers and people that want to build Xfce from Git.
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
diff --git a/source.local/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild b/source.local/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
new file mode 100755
index 0000000..6d3e8bd
--- /dev/null
+++ b/source.local/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfce4-dev-tools
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-mixer/doinst.sh.gz b/source.local/xfce/xfce4-mixer/doinst.sh.gz
new file mode 100644
index 0000000..58da219
--- /dev/null
+++ b/source.local/xfce/xfce4-mixer/doinst.sh.gz
diff --git a/source.local/xfce/xfce4-mixer/slack-desc b/source.local/xfce/xfce4-mixer/slack-desc
new file mode 100644
index 0000000..7274187
--- /dev/null
+++ b/source.local/xfce/xfce4-mixer/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 ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+xfce4-mixer: xfce4-mixer (Sound mixer applet for Xfce)
+xfce4-mixer:
+xfce4-mixer: The xfce4-mixer package contains a volume control application based 
+xfce4-mixer: on GStreamer written to conceptually fit into the Xfce desktop 
+xfce4-mixer: environment.  It also contains a plugin for the Xfce panel which is 
+xfce4-mixer: especially designed for use with the mouse wheel.
+xfce4-mixer:
+xfce4-mixer:
+xfce4-mixer:
+xfce4-mixer:
+xfce4-mixer:
diff --git a/source.local/xfce/xfce4-mixer/xfce4-mixer.SlackBuild b/source.local/xfce/xfce4-mixer/xfce4-mixer.SlackBuild
new file mode 100755
index 0000000..05ae280
--- /dev/null
+++ b/source.local/xfce/xfce4-mixer/xfce4-mixer.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-mixer
+
+# Copyright 2010, 2011  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.
+
+PKGNAM=xfce4-mixer
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/xfce \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING INSTALL NEWS README* THANKS 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xap/xfce4-notifyd/doinst.sh.gz b/source.local/xfce/xfce4-notifyd/doinst.sh.gz
index c199330..c199330 100644
--- a/source.local/xap/xfce4-notifyd/doinst.sh.gz
+++ b/source.local/xfce/xfce4-notifyd/doinst.sh.gz
diff --git a/source.local/xap/xfce4-notifyd/slack-desc b/source.local/xfce/xfce4-notifyd/slack-desc
index 1463db0..1463db0 100644
--- a/source.local/xap/xfce4-notifyd/slack-desc
+++ b/source.local/xfce/xfce4-notifyd/slack-desc
diff --git a/source.local/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source.local/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
new file mode 100755
index 0000000..e869113
--- /dev/null
+++ b/source.local/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
@@ -0,0 +1,133 @@
+#!/bin/sh
+
+# Slackware build script for Xfce4-notifyd
+
+# Copyright 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
+# Copyright 2010  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=xfce4-notifyd
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \) \
+ -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" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/xfce \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-debug=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install-strip DESTDIR=$PKG || exit 1
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
+
diff --git a/source.local/xfce/xfce4-panel/slack-desc b/source.local/xfce/xfce4-panel/slack-desc
new file mode 100644
index 0000000..0711bf8
--- /dev/null
+++ b/source.local/xfce/xfce4-panel/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 ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+xfce4-panel: xfce4-panel (panel for Xfce)
+xfce4-panel:
+xfce4-panel: The Xfce panel is part of the Xfce Desktop Environment and features
+xfce4-panel: program launchers, panel menus, a clock, a desktop switcher, and more.
+xfce4-panel: Many aspects of the panel can be configured through graphical dialogs,
+xfce4-panel: but also by GTK+ style properties and Xfconf settings.
+xfce4-panel:
+xfce4-panel:
+xfce4-panel:
+xfce4-panel:
+xfce4-panel:
diff --git a/source.local/xfce/xfce4-panel/xfce4-panel.SlackBuild b/source.local/xfce/xfce4-panel/xfce4-panel.SlackBuild
new file mode 100755
index 0000000..1ba4bb6
--- /dev/null
+++ b/source.local/xfce/xfce4-panel/xfce4-panel.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfce4-panel
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-power-manager/doinst.sh.gz b/source.local/xfce/xfce4-power-manager/doinst.sh.gz
new file mode 100644
index 0000000..64bc078
--- /dev/null
+++ b/source.local/xfce/xfce4-power-manager/doinst.sh.gz
diff --git a/source.local/xfce/xfce4-power-manager/slack-desc b/source.local/xfce/xfce4-power-manager/slack-desc
new file mode 100644
index 0000000..8c79d3d
--- /dev/null
+++ b/source.local/xfce/xfce4-power-manager/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 ':'.
+
+                   |-----handy-ruler------------------------------------------------|
+xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce)
+xfce4-power-manager:
+xfce4-power-manager: xfce4-power-manager makes power management functions (such as
+xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment.
+xfce4-power-manager:
+xfce4-power-manager:
+xfce4-power-manager:
+xfce4-power-manager:
+xfce4-power-manager:
+xfce4-power-manager:
+xfce4-power-manager:
diff --git a/source.local/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source.local/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
new file mode 100755
index 0000000..cf1dc7a
--- /dev/null
+++ b/source.local/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-power-manager
+
+# Copyright 2006-2012  Robby Workman  Northport, Alabama, USA
+# Copyright 2009, 2010  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=xfce4-power-manager
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP || 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 \) \
+ -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" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-shared=yes \
+  --enable-static=no \
+  --enable-debug=no \
+  --enable-network-manager \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
+cp -a \
+  AUTHORS COPYING* NEWS README* TODO \
+    $PKG/usr/doc/$PKGNAM-$VERSION
+( cd $PKG/usr/doc/$PKGNAM-$VERSION/html
+  ln -s /usr/share/xfce4/doc/C/xfce4-power-manager.html index.html
+  ln -s /usr/share/xfce4/doc/C/images .
+)
+
+# 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-screenshooter/doinst.sh.gz b/source.local/xfce/xfce4-screenshooter/doinst.sh.gz
new file mode 100644
index 0000000..0edcbb3
--- /dev/null
+++ b/source.local/xfce/xfce4-screenshooter/doinst.sh.gz
diff --git a/source.local/xfce/xfce4-screenshooter/slack-desc b/source.local/xfce/xfce4-screenshooter/slack-desc
new file mode 100644
index 0000000..83eeaf7
--- /dev/null
+++ b/source.local/xfce/xfce4-screenshooter/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 ':'.
+
+                   |-----handy-ruler------------------------------------------------------|
+xfce4-screenshooter: xfce4-screenshooter (screenshooter plugin for Xfce)
+xfce4-screenshooter:
+xfce4-screenshooter: The screenshooter plugin adds a panel button that allows you to take
+xfce4-screenshooter: screenshots.
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
diff --git a/source.local/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild b/source.local/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild
new file mode 100755
index 0000000..a801889
--- /dev/null
+++ b/source.local/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-screenshooter
+
+# Copyright 2006-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.
+
+PKGNAM=xfce4-screenshooter
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/xfce \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --mandir=/usr/man \
+  --enable-shared=yes \
+  --enable-static=no \
+  --enable-debug=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+    $PKG/usr/doc/$PKGNAM-$VERSION
+
+if [ -d $PKG/usr/share/doc/xfce4-screenshooter ]; then # --docdir was ignored
+  mv $PKG/usr/share/doc/xfce4-screenshooter/* $PKG/usr/doc/$PKGNAM-$VERSION
+  ( cd $PKG/usr/share ; rmdir -p doc/xfce4-screenshooter )
+fi
+
+# 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-screenshooter/xfce4-screenshooter.url b/source.local/xfce/xfce4-screenshooter/xfce4-screenshooter.url
new file mode 100644
index 0000000..48b2447
--- /dev/null
+++ b/source.local/xfce/xfce4-screenshooter/xfce4-screenshooter.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/apps/xfce4-screenshooter/
diff --git a/source.local/xfce/xfce4-session/slack-desc b/source.local/xfce/xfce4-session/slack-desc
new file mode 100644
index 0000000..235feb3
--- /dev/null
+++ b/source.local/xfce/xfce4-session/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 ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+xfce4-session: xfce4-session (Xfce session manager)
+xfce4-session:
+xfce4-session: Xfce4-session is a session manager for Xfce.  Its task is to save the
+xfce4-session: state of your desktop (opened applications and their location) and
+xfce4-session: restore it during a next startup.  You can create several different
+xfce4-session: sessions and choose one of them on startup.
+xfce4-session:
+xfce4-session:
+xfce4-session:
+xfce4-session:
+xfce4-session:
diff --git a/source.local/xfce/xfce4-session/xfce4-session.SlackBuild b/source.local/xfce/xfce4-session/xfce4-session.SlackBuild
new file mode 100755
index 0000000..9e9826d
--- /dev/null
+++ b/source.local/xfce/xfce4-session/xfce4-session.SlackBuild
@@ -0,0 +1,148 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfce4-session
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/patches/load_systemwide_Xmodmap_file.diff.gz | patch -p1 || 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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-libgnome-keyring \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-settings/slack-desc b/source.local/xfce/xfce4-settings/slack-desc
new file mode 100644
index 0000000..590a3b3
--- /dev/null
+++ b/source.local/xfce/xfce4-settings/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 ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+xfce4-settings: xfce4-settings (Xfce settings manager)
+xfce4-settings:
+xfce4-settings: xfce4-settings is the Xfce settings manager front-end.  It comes with
+xfce4-settings: several different components for configuring application-independent
+xfce4-settings: settings inside xfconf.
+xfce4-settings:
+xfce4-settings:
+xfce4-settings:
+xfce4-settings:
+xfce4-settings:
+xfce4-settings:
diff --git a/source.local/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source.local/xfce/xfce4-settings/xfce4-settings.SlackBuild
new file mode 100755
index 0000000..92fb4bf
--- /dev/null
+++ b/source.local/xfce/xfce4-settings/xfce4-settings.SlackBuild
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfce4-settings
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-pluggable-dialogs \
+  --enable-sound-settings \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-settings/xfce4-settings.theme.diff.gz b/source.local/xfce/xfce4-settings/xfce4-settings.theme.diff.gz
new file mode 100644
index 0000000..ee09b03
--- /dev/null
+++ b/source.local/xfce/xfce4-settings/xfce4-settings.theme.diff.gz
diff --git a/source.local/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff.gz b/source.local/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff.gz
new file mode 100644
index 0000000..9260160
--- /dev/null
+++ b/source.local/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff.gz
diff --git a/source.local/xfce/xfce4-systemload-plugin/slack-desc b/source.local/xfce/xfce4-systemload-plugin/slack-desc
new file mode 100644
index 0000000..e83e930
--- /dev/null
+++ b/source.local/xfce/xfce4-systemload-plugin/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 ':'.
+
+                       |-----handy-ruler------------------------------------------------------|
+xfce4-systemload-plugin: xfce4-systemload-plugin (systemload plugin for the Xfce panel)
+xfce4-systemload-plugin:
+xfce4-systemload-plugin: This plugin displays the current system load on the Xfce panel.
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
diff --git a/source.local/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source.local/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
new file mode 100755
index 0000000..f816a48
--- /dev/null
+++ b/source.local/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-systemload-plugin
+
+# Copyright 2006-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.
+
+# Maintained by Ozan Turkyilmaz ozan.turkyilmaz@gmail.com
+
+PKGNAM=xfce4-systemload-plugin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/xfce \
+  --enable-shared=yes \
+  --enable-static=no \
+  --enable-debug=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+    $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url b/source.local/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url
new file mode 100644
index 0000000..17d17c5
--- /dev/null
+++ b/source.local/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/
diff --git a/source.local/xfce/xfce4-taskmanager/doinst.sh.gz b/source.local/xfce/xfce4-taskmanager/doinst.sh.gz
new file mode 100644
index 0000000..2fcebdd
--- /dev/null
+++ b/source.local/xfce/xfce4-taskmanager/doinst.sh.gz
diff --git a/source.local/xfce/xfce4-taskmanager/slack-desc b/source.local/xfce/xfce4-taskmanager/slack-desc
new file mode 100644
index 0000000..f4e05a1
--- /dev/null
+++ b/source.local/xfce/xfce4-taskmanager/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 ':'.
+
+                 |-----handy-ruler------------------------------------------------------|
+xfce4-taskmanager: xfce4-taskmanager (running apps / task manager application)
+xfce4-taskmanager:
+xfce4-taskmanager: xfce4-taskmanager shows a list of running apps (similar to the
+xfce4-taskmanager: task manager included with some other operating systems)  :)
+xfce4-taskmanager:
+xfce4-taskmanager: The taskmanager is started by running the command 'xfce4-taskmanager'
+xfce4-taskmanager:
+xfce4-taskmanager:
+xfce4-taskmanager:
+xfce4-taskmanager:
+xfce4-taskmanager:
diff --git a/source.local/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/source.local/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
new file mode 100755
index 0000000..cbc4a58
--- /dev/null
+++ b/source.local/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-taskmanager
+
+# Copyright 2006-2011  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.
+
+PKGNAM=xfce4-taskmanager
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/xfce \
+  --enable-shared=yes \
+  --enable-static=no \
+  --enable-debug=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* \
+    $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-taskmanager/xfce4-taskmanager.url b/source.local/xfce/xfce4-taskmanager/xfce4-taskmanager.url
new file mode 100644
index 0000000..7cefa66
--- /dev/null
+++ b/source.local/xfce/xfce4-taskmanager/xfce4-taskmanager.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/apps/xfce4-taskmanager
diff --git a/source.local/xfce/xfce4-terminal/slack-desc b/source.local/xfce/xfce4-terminal/slack-desc
new file mode 100644
index 0000000..a76b06b
--- /dev/null
+++ b/source.local/xfce/xfce4-terminal/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 ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+xfce4-terminal: xfce4-terminal (Xfce's Terminal Emulator)
+xfce4-terminal:
+xfce4-terminal: This is the Xfce terminal emulator application.  xfce4-terminal is 
+xfce4-terminal: a lightweight and easy to use terminal emulator for the X windowing
+xfce4-terminal: system, with some new ideas and features that make it unique among 
+xfce4-terminal: X terminal emulators.
+xfce4-terminal:
+xfce4-terminal:
+xfce4-terminal:
+xfce4-terminal:
+xfce4-terminal:
diff --git a/source.local/xfce/xfce4-terminal/xfce4-terminal.SlackBuild b/source.local/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
new file mode 100755
index 0000000..fd16a55
--- /dev/null
+++ b/source.local/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-terminal
+
+# Copyright 2010,2011,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.
+
+PKGNAM=xfce4-terminal
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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/xfce \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* HACKING INSTALL NEWS README* THANKS 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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-volumed/slack-desc b/source.local/xfce/xfce4-volumed/slack-desc
new file mode 100644
index 0000000..e9266cb
--- /dev/null
+++ b/source.local/xfce/xfce4-volumed/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 ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+xfce4-volumed: xfce4-volumed (audio volume management daemon)
+xfce4-volumed:
+xfce4-volumed: This daemon is responsible for making the volume up/down and mute 
+xfce4-volumed: keys of the keyboard work automatically, and uses the XFCE mixer's 
+xfce4-volumed: defined card and track for choosing which track to act on. 
+xfce4-volumed:
+xfce4-volumed: It also provides volume change and mute toggle notifications if 
+xfce4-volumed: a notification daemon is running (using libnotify).
+xfce4-volumed:
+xfce4-volumed: Homepage: https://launchpad.net/xfce4-volumed
+xfce4-volumed:
diff --git a/source.local/xfce/xfce4-volumed/xfce4-volumed.SlackBuild b/source.local/xfce/xfce4-volumed/xfce4-volumed.SlackBuild
new file mode 100755
index 0000000..44e73a1
--- /dev/null
+++ b/source.local/xfce/xfce4-volumed/xfce4-volumed.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-volumed
+
+# Copyright 2006-2011  Robby Workman  Northport, Alabama, USA
+# Copyright 2009  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=xfce4-volumed
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -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" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-debug=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS \
+    $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-weather-plugin/slack-desc b/source.local/xfce/xfce4-weather-plugin/slack-desc
new file mode 100644
index 0000000..7d9b067
--- /dev/null
+++ b/source.local/xfce/xfce4-weather-plugin/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 ':'.
+
+                    |-----handy-ruler------------------------------------------------------|
+xfce4-weather-plugin: xfce4-weather-plugin (weather plugin for the Xfce panel)
+xfce4-weather-plugin:
+xfce4-weather-plugin: The weather plugin displays current weather conditions and forecasts.
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
diff --git a/source.local/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source.local/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
new file mode 100755
index 0000000..c0b63e7
--- /dev/null
+++ b/source.local/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-weather-plugin
+
+# Copyright 2006-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.
+
+PKGNAM=xfce4-weather-plugin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+GEONAMES_USERNAME="slackware" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/xfce \
+  --enable-shared=yes \
+  --enable-static=no \
+  --enable-debug=no \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs 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/$PKGNAM-$VERSION
+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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url b/source.local/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
new file mode 100644
index 0000000..9ee0ef0
--- /dev/null
+++ b/source.local/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/
diff --git a/source.local/xfce/xfconf/slack-desc b/source.local/xfce/xfconf/slack-desc
new file mode 100644
index 0000000..a48abb4
--- /dev/null
+++ b/source.local/xfce/xfconf/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 ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+xfconf: xfconf (Xfce configuration storage system)
+xfconf:
+xfconf: A daemon and query system for managing the storage and retrieval of
+xfconf: settings for the Xfce Desktop Environment, both graphically as well as
+xfconf: from the command line.
+xfconf:
+xfconf:
+xfconf:
+xfconf:
+xfconf:
+xfconf:
diff --git a/source.local/xfce/xfconf/xfconf.SlackBuild b/source.local/xfce/xfconf/xfconf.SlackBuild
new file mode 100755
index 0000000..c63bb40
--- /dev/null
+++ b/source.local/xfce/xfconf/xfconf.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfconf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfdesktop/slack-desc b/source.local/xfce/xfdesktop/slack-desc
new file mode 100644
index 0000000..e98b02b
--- /dev/null
+++ b/source.local/xfce/xfdesktop/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 ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+xfdesktop: xfdesktop (Xfce desktop manager)
+xfdesktop:
+xfdesktop: Xfdesktop is a desktop manager for the Xfce Desktop Environment.
+xfdesktop: Desktop in this respect means the root window.  The manager handles
+xfdesktop: tasks such as the background image and color, the root menu and window
+xfdesktop: list, minimized application icons, and file icons on the desktop.
+xfdesktop:
+xfdesktop:
+xfdesktop:
+xfdesktop:
+xfdesktop:
diff --git a/source.local/xfce/xfdesktop/xfdesktop.SlackBuild b/source.local/xfce/xfdesktop/xfdesktop.SlackBuild
new file mode 100755
index 0000000..6963160
--- /dev/null
+++ b/source.local/xfce/xfdesktop/xfdesktop.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfdesktop
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfwm4-themes/slack-desc b/source.local/xfce/xfwm4-themes/slack-desc
new file mode 100644
index 0000000..dca6ee9
--- /dev/null
+++ b/source.local/xfce/xfwm4-themes/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 ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+xfwm4-themes: xfwm4-themes (themes for the Xfce window manager)
+xfwm4-themes:
+xfwm4-themes: This package contains a wide variety of themes for xfwm4, the window
+xfwm4-themes: manager of the Xfce4 project.  If the default theme is not to your
+xfwm4-themes: liking, you'll probably find the eyecandy you're looking for here.
+xfwm4-themes:
+xfwm4-themes:
+xfwm4-themes:
+xfwm4-themes:
+xfwm4-themes:
+xfwm4-themes:
diff --git a/source.local/xfce/xfwm4-themes/xfwm4-themes.SlackBuild b/source.local/xfce/xfwm4-themes/xfwm4-themes.SlackBuild
new file mode 100755
index 0000000..b7f42f0
--- /dev/null
+++ b/source.local/xfce/xfwm4-themes/xfwm4-themes.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfwm4-themes
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfwm4/slack-desc b/source.local/xfce/xfwm4/slack-desc
new file mode 100644
index 0000000..89db3f5
--- /dev/null
+++ b/source.local/xfce/xfwm4/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 ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+xfwm4: xfwm4 (Xfce Window Manager)
+xfwm4:
+xfwm4: This package contains xfwm4 which is the window manager for Xfce4.
+xfwm4: It is designed to run with the rest of Xfce, but it also makes a
+xfwm4: capable window manager for any X11 environment.
+xfwm4:
+xfwm4:
+xfwm4:
+xfwm4:
+xfwm4:
+xfwm4:
diff --git a/source.local/xfce/xfwm4/xfwm.gtk3.099614e3f045e06db7ab509e174510ea74857adb.diff.gz b/source.local/xfce/xfwm4/xfwm.gtk3.099614e3f045e06db7ab509e174510ea74857adb.diff.gz
new file mode 100644
index 0000000..0df6974
--- /dev/null
+++ b/source.local/xfce/xfwm4/xfwm.gtk3.099614e3f045e06db7ab509e174510ea74857adb.diff.gz
diff --git a/source.local/xfce/xfwm4/xfwm4.SlackBuild b/source.local/xfce/xfwm4/xfwm4.SlackBuild
new file mode 100755
index 0000000..d5ff2da
--- /dev/null
+++ b/source.local/xfce/xfwm4/xfwm4.SlackBuild
@@ -0,0 +1,151 @@
+#!/bin/sh
+
+# Copyright 2012, 2013  Patrick J. Volkerding, Sebeka, Minnesota, 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=xfwm4
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
+else
+  # 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
+  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+  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"
+  else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
+  fi
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/xfwm.gtk3.099614e3f045e06db7ab509e174510ea74857adb.diff.gz | patch -p1 --verbose || 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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-static \
+  --disable-debug \
+  --build=$TARGET || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/etc/X11/xinit
+cat $CWD/xinitrc.xfce > $PKG/etc/X11/xinit/xinitrc.xfce
+chmod 0755 $PKG/etc/X11/xinit/*
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory.  Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+  $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/${PKGNAM}-$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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source.local/xfce/xfwm4/xinitrc.xfce b/source.local/xfce/xfwm4/xinitrc.xfce
new file mode 100644
index 0000000..82c0dd4
--- /dev/null
+++ b/source.local/xfce/xfwm4/xinitrc.xfce
@@ -0,0 +1,40 @@
+#!/bin/sh
+#  xinitrc.xfce - modified to work around xfce4session bug
+#                 https://bugzilla.xfce.org/show_bug.cgi?id=8841
+
+
+########################################################################
+##  Merge in defaults and keymaps                                     ##
+########################################################################
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+if [ -f $sysresources ]; then
+    /usr/bin/xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    /usr/bin/xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    /usr/bin/xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    /usr/bin/xmodmap $usermodmap
+fi
+
+########################################################################
+##  Start xfce Desktop Environment                                    ##
+########################################################################
+
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  exec ck-launch-session dbus-launch --exit-with-session /usr/bin/startxfce4
+else
+  exec dbus-launch --exit-with-session /usr/bin/startxfce4
+fi
+