20150906.1 global branch merge.current-20150906.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
author: Matteo Bernardini 2015-09-06 11:33:14 +0200
committer: Matteo Bernardini 2015-09-06 11:33:14 +0200
commit: d9304ba8c566df3d4ad187919c353649084cdbc8 (patch)
tree: 8867a986555f0476a49fbf7fc094a55d5becd739 /system
parent: 277bbd069a9b13040dafc7abf299720a1c6a1a80 (diff)
download: old.slackbuilds-f004527258b7f05ce0a8b8d21f91d03413a39d6c.tar.gz
80 files changed, 1336 insertions, 648 deletions
diff --git a/system/cdemu-client/cdemu-client.SlackBuild b/system/cdemu-client/cdemu-client.SlackBuild
index 33e96881d4..27b288e728 100644
--- a/system/cdemu-client/cdemu-client.SlackBuild
+++ b/system/cdemu-client/cdemu-client.SlackBuild
@@ -23,10 +23,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Revision date: 2013/03/31
-
 PRGNAM=cdemu-client
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-3.0.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -51,7 +49,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
diff --git a/system/cdemu-client/cdemu-client.info b/system/cdemu-client/cdemu-client.info
index 2608974f10..b7effb60e0 100644
--- a/system/cdemu-client/cdemu-client.info
+++ b/system/cdemu-client/cdemu-client.info
@@ -1,8 +1,8 @@
 PRGNAM="cdemu-client"
-VERSION="2.0.0"
+VERSION="3.0.0"
 HOMEPAGE="http://cdemu.sourceforge.net/about/client/"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-client-2.0.0.tar.bz2"
-MD5SUM="ceeec43270c28ea02c7e8a5a7009f3e0"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-client-3.0.0.tar.bz2"
+MD5SUM="4e188ec42b1db005ed96b81db52a20ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cdemu-daemon"
diff --git a/system/cdemu-daemon/cdemu-daemon.SlackBuild b/system/cdemu-daemon/cdemu-daemon.SlackBuild
index 9289c4aeef..9043928316 100644
--- a/system/cdemu-daemon/cdemu-daemon.SlackBuild
+++ b/system/cdemu-daemon/cdemu-daemon.SlackBuild
@@ -23,10 +23,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Revision date: 2013/03/31
-
 PRGNAM=cdemu-daemon
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-3.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,7 +70,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
diff --git a/system/cdemu-daemon/cdemu-daemon.info b/system/cdemu-daemon/cdemu-daemon.info
index 639a2c3178..b5f48d82a5 100644
--- a/system/cdemu-daemon/cdemu-daemon.info
+++ b/system/cdemu-daemon/cdemu-daemon.info
@@ -1,8 +1,8 @@
 PRGNAM="cdemu-daemon"
-VERSION="2.0.0"
+VERSION="3.0.2"
 HOMEPAGE="http://cdemu.sourceforge.net/about/daemon/"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-daemon-2.0.0.tar.bz2"
-MD5SUM="8f6ad3a9f758938e1572046bccc30417"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-daemon-3.0.2.tar.bz2"
+MD5SUM="ada2ec2ff2e1bbbc10c596414b4ba77d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmirage vhba-module"
diff --git a/system/conky/conky.info b/system/conky/conky.info
index 3662771408..462cfc7e62 100644
--- a/system/conky/conky.info
+++ b/system/conky/conky.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/conky/conky-1.9.0.tar.bz2"
 MD5SUM="d3de615f43aadc98d555e05ad9e902c2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libaudclient"
 MAINTAINER="M.Dinslage"
 EMAIL="daedra1980@gmail.com"
diff --git a/system/d-feet/README b/system/d-feet/README
index d91d5122e9..53cfec895f 100644
--- a/system/d-feet/README
+++ b/system/d-feet/README
@@ -1 +1,5 @@
-D-Feet is a D-Bus debugger written in PyGtk by John (J5) Palmieri.
+D-Feet is a D-Bus debugger originally written in PyGtk
+by John (J5) Palmieri and now rewritten basing on
+gobject-introspection and gdbus by Thomas Bechtold.
+
+pep8 is an optional dependency to enable build-time tests.
diff --git a/system/d-feet/d-feet.SlackBuild b/system/d-feet/d-feet.SlackBuild
index 571de4bd05..24f6482498 100644
--- a/system/d-feet/d-feet.SlackBuild
+++ b/system/d-feet/d-feet.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=d-feet
-VERSION=0.1.12
+VERSION=${VERSION:-0.3.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,13 +40,29 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+tests="--disable-tests" ; [ $(which pep8) ] && tests=""
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -55,14 +71,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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 \
-  AUTHORS COPYING PKG-INFO README \
+  AUTHORS COPYING NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/d-feet/d-feet.info b/system/d-feet/d-feet.info
index 3370ca44d9..a725f96cf2 100644
--- a/system/d-feet/d-feet.info
+++ b/system/d-feet/d-feet.info
@@ -1,10 +1,10 @@
 PRGNAM="d-feet"
-VERSION="0.1.12"
+VERSION="0.3.10"
 HOMEPAGE="http://live.gnome.org/DFeet/"
-DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/d-feet/0.1/d-feet-0.1.12.tar.bz2"
-MD5SUM="01b0296277b26330bc430742ad4e758a"
+DOWNLOAD="http://download.gnome.org/sources/d-feet/0.3/d-feet-0.3.10.tar.xz"
+MD5SUM="a1ad05205cc68650c2770eeeb7c81953"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pysetuptools"
+REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/system/d-feet/slack-desc b/system/d-feet/slack-desc
index 0f08cf96a3..e120c2eedf 100644
--- a/system/d-feet/slack-desc
+++ b/system/d-feet/slack-desc
@@ -8,7 +8,7 @@
       |-----handy-ruler------------------------------------------------------|
 d-feet: D-Feet (D-Bus Debugger)
 d-feet:
-d-feet: D-Feet is a D-Bus debugger written in PyGtk.
+d-feet: D-Feet is a D-Bus debugger.
 d-feet:
 d-feet: Current features include:
 d-feet: - View names on any bus
diff --git a/system/dynamips/dynamips.SlackBuild b/system/dynamips/dynamips.SlackBuild
index 77685c3673..a9edf005e9 100644
--- a/system/dynamips/dynamips.SlackBuild
+++ b/system/dynamips/dynamips.SlackBuild
@@ -74,7 +74,6 @@ find -L . \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 
-sed -i 's/<\(libelf.h\)>/<libelf\/\1>/' common/dynamips.h common/rom2c.c
 sed -i 's/^\(\.PHONY: all dynamips\)/# \1/' Makefile
 
 if [ $ARCH == "x86_64" ]
diff --git a/system/emelfm2/emelfm2.SlackBuild b/system/emelfm2/emelfm2.SlackBuild
index cf7f1454bb..e617d17a43 100644
--- a/system/emelfm2/emelfm2.SlackBuild
+++ b/system/emelfm2/emelfm2.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=emelfm2
-VERSION=0.8.1
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/emelfm2/emelfm2.info b/system/emelfm2/emelfm2.info
index 5763dcd630..eefb293c3b 100644
--- a/system/emelfm2/emelfm2.info
+++ b/system/emelfm2/emelfm2.info
@@ -1,8 +1,8 @@
 PRGNAM="emelfm2"
-VERSION="0.8.1"
+VERSION="0.9.1"
 HOMEPAGE="http://www.emelfm2.net"
-DOWNLOAD="http://emelfm2.net/rel/emelfm2-0.8.1.tar.bz2"
-MD5SUM="00368bca4c88733e7d70f46cc4db890c"
+DOWNLOAD="http://emelfm2.net/rel/emelfm2-0.9.1.tar.bz2"
+MD5SUM="ea83b73d76edf1cea5bce00ec630af6f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
index b05b640454..97b8d16a24 100644
--- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
+++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Upstream script needs to be more assertive with Autotools :-)
+sed -e 's/autoconf/autoreconf -vif/' -i bootstrap
+
 ./bootstrap
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/system/file-roller/file-roller.SlackBuild b/system/file-roller/file-roller.SlackBuild
index 39d43d77a2..36c3935b27 100644
--- a/system/file-roller/file-roller.SlackBuild
+++ b/system/file-roller/file-roller.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=file-roller
-VERSION=${VERSION:-2.32.2}
+VERSION=${VERSION:-3.16.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,8 +81,7 @@ CFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --localedir=/usr/share/locale \
-  --disable-scrollkeeper \
-  --with-gtk=2.0 \
+  --enable-libarchive \
   --disable-static \
   --enable-shared \
   --build=$ARCH-slackware-linux
diff --git a/system/file-roller/file-roller.info b/system/file-roller/file-roller.info
index 47424fce5f..e86b3fe62e 100644
--- a/system/file-roller/file-roller.info
+++ b/system/file-roller/file-roller.info
@@ -1,8 +1,8 @@
 PRGNAM="file-roller"
-VERSION="2.32.2"
+VERSION="3.16.3"
 HOMEPAGE="http://fileroller.sourceforge.net/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/file-roller/2.32/file-roller-2.32.2.tar.bz2"
-MD5SUM="2ec596e237c2f3af1d7d3f5b9c12884f"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.16/file-roller-3.16.3.tar.xz"
+MD5SUM="407b976f0b7fb6fd4c7ce43967c309e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gcdemu/gcdemu.SlackBuild b/system/gcdemu/gcdemu.SlackBuild
index 0048d51840..3b664074b7 100644
--- a/system/gcdemu/gcdemu.SlackBuild
+++ b/system/gcdemu/gcdemu.SlackBuild
@@ -22,10 +22,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Revision date: 2013/03/31
-
 PRGNAM=gcdemu
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-3.0.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -48,7 +46,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
diff --git a/system/gcdemu/gcdemu.info b/system/gcdemu/gcdemu.info
index 834d282223..7463ee8b33 100644
--- a/system/gcdemu/gcdemu.info
+++ b/system/gcdemu/gcdemu.info
@@ -1,8 +1,8 @@
 PRGNAM="gcdemu"
-VERSION="2.0.0"
+VERSION="3.0.0"
 HOMEPAGE="http://cdemu.sourceforge.net/about/gcdemu/"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/gcdemu-2.0.0.tar.bz2"
-MD5SUM="31691b368ffa9e34b6b776cb7adeebd9"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/gcdemu-3.0.0.tar.bz2"
+MD5SUM="e64a5b9a9d704e948958fe983de621c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cdemu-daemon gnome-python pygobject3"
diff --git a/system/gentoo/gentoo.SlackBuild b/system/gentoo/gentoo.SlackBuild
index 1c75f1e35a..e4f65129c1 100644
--- a/system/gentoo/gentoo.SlackBuild
+++ b/system/gentoo/gentoo.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gentoo
-VERSION=${VERSION:-0.20.4}
+VERSION=${VERSION:-0.20.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/gentoo/gentoo.info b/system/gentoo/gentoo.info
index 1838fc26f4..07727771cf 100644
--- a/system/gentoo/gentoo.info
+++ b/system/gentoo/gentoo.info
@@ -1,8 +1,8 @@
 PRGNAM="gentoo"
-VERSION="0.20.4"
+VERSION="0.20.6"
 HOMEPAGE="http://obsession.se/gentoo/"
-DOWNLOAD="http://sourceforge.net/projects/gentoo/files/gentoo/0.20.4/gentoo-0.20.4.tar.gz"
-MD5SUM="9e10f5ad00613b63eb02cde89506153d"
+DOWNLOAD="http://sourceforge.net/projects/gentoo/files/gentoo/0.20.6/gentoo-0.20.6.tar.gz"
+MD5SUM="3532dfc03abacbe06ba6639160ed46d7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gtklp/gtklp.SlackBuild b/system/gtklp/gtklp.SlackBuild
index 1b1de127e5..09a4d851e6 100644
--- a/system/gtklp/gtklp.SlackBuild
+++ b/system/gtklp/gtklp.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Luis Henrique <lmello.009@gmail.com>
 
 PRGNAM=gtklp
-VERSION=${VERSION:-1.2.9}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,6 +45,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/gtklp/gtklp.info b/system/gtklp/gtklp.info
index 33e09f2555..1b67c7506a 100644
--- a/system/gtklp/gtklp.info
+++ b/system/gtklp/gtklp.info
@@ -1,8 +1,8 @@
 PRGNAM="gtklp"
-VERSION="1.2.9"
+VERSION="1.3.1"
 HOMEPAGE="http://gtklp.sirtobi.com/"
-DOWNLOAD="http://downloads.sourceforge.net/gtklp/gtklp-1.2.9.src.tar.gz"
-MD5SUM="822b04c9eba65aa14c1d6fd4a3454a37"
+DOWNLOAD="http://downloads.sourceforge.net/gtklp/gtklp-1.3.1.src.tar.gz"
+MD5SUM="4b77d070aafeab45d134a4f9a12883bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/image-analyzer/image-analyzer.SlackBuild b/system/image-analyzer/image-analyzer.SlackBuild
index 7701f49436..9281c59193 100644
--- a/system/image-analyzer/image-analyzer.SlackBuild
+++ b/system/image-analyzer/image-analyzer.SlackBuild
@@ -23,10 +23,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Revision date: 2013/03/31
-
 PRGNAM=image-analyzer
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,7 +70,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
diff --git a/system/image-analyzer/image-analyzer.info b/system/image-analyzer/image-analyzer.info
index 51e06ef6e0..e5927d90b3 100644
--- a/system/image-analyzer/image-analyzer.info
+++ b/system/image-analyzer/image-analyzer.info
@@ -1,8 +1,8 @@
 PRGNAM="image-analyzer"
-VERSION="2.0.0"
+VERSION="3.0.0"
 HOMEPAGE="http://cdemu.sourceforge.net/about/analyzer/"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/image-analyzer-2.0.0.tar.bz2"
-MD5SUM="ede5b4757a32897e53c627e0a7eb9e65"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/image-analyzer-3.0.0.tar.bz2"
+MD5SUM="13a3c4ebd30d9087df3ae498fd59e267"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmirage"
diff --git a/system/libnatspec/libnatspec.SlackBuild b/system/libnatspec/libnatspec.SlackBuild
index 073c274af3..33b5926127 100644
--- a/system/libnatspec/libnatspec.SlackBuild
+++ b/system/libnatspec/libnatspec.SlackBuild
@@ -69,8 +69,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-libtoolize --copy --force
-autoreconf
+autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/lzip/README b/system/lzip/README
deleted file mode 100644
index c0ebf2736c..0000000000
--- a/system/lzip/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Lzip is a lossless data compressor based on the LZMA (Lempel-Ziv-Markov
-chain-Algorithm) algorithm designed by Igor Pavlov.  Lzip decompresses 
-almost as fast as gzip and compresses better than bzip2, but requires
-more memory and time during compression. These features make lzip well
-suited for software distribution and data archival.
-Lzip has a user interface similar to the one of gzip or bzip2.
diff --git a/system/lzip/lzip.info b/system/lzip/lzip.info
deleted file mode 100644
index 8608a3ca86..0000000000
--- a/system/lzip/lzip.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lzip"
-VERSION="1.16"
-HOMEPAGE="http://www.nongnu.org/lzip/lzip.html"
-DOWNLOAD="http://download.savannah.gnu.org/releases/lzip/lzip-1.16.tar.gz"
-MD5SUM="716a9876dc595ec52d4f3bda81e42471"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Barry J. Grundy"
-EMAIL="bgrundy<at>linuxleo.com"
diff --git a/system/lzip/slack-desc b/system/lzip/slack-desc
deleted file mode 100644
index 5c7e5f4ac1..0000000000
--- a/system/lzip/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 ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-lzip: lzip (lossless data compression tool)
-lzip:
-lzip: Lzip is a lossless data compressor based on the LZMA (Lempel-Ziv-Markov
-lzip: chain-Algorithm) algorithm designed by Igor Pavlov.  Lzip decompresses
-lzip: almost as fast as gzip and compresses better than bzip2, but requires
-lzip: more memory and time during compression. These features make lzip well
-lzip: suited for software distribution and data archival.
-lzip: Lzip has a user interface similar to the one of gzip or bzip2.
-lzip:
-lzip: Homepage: http://www.nongnu.org/lzip/lzip.html
-lzip:
diff --git a/system/macemu/README b/system/macemu/README
new file mode 100644
index 0000000000..2345e13672
--- /dev/null
+++ b/system/macemu/README
@@ -0,0 +1,5 @@
+BasiliskII and SheepShaver are two Open Source 68k and PowerPC
+Macintosh emulators.
+They allow you to run 68k and PowerPC MacOS software on your computer,
+however you still need a copy of MacOS and a Macintosh ROM image to
+use it.
diff --git a/system/macemu/doinst.sh b/system/macemu/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/system/macemu/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/macemu/files/BasiliskII.desktop b/system/macemu/files/BasiliskII.desktop
new file mode 100644
index 0000000000..966b04efbf
--- /dev/null
+++ b/system/macemu/files/BasiliskII.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Basilisk II
+Comment=68k Macintosh Emulator
+Exec=BasiliskII
+Icon=BasiliskII.svg
+Terminal=false
+Type=Application
+Categories=Application;Utility;
+Encoding=UTF-8
diff --git a/system/macemu/files/BasiliskII.svg b/system/macemu/files/BasiliskII.svg
new file mode 100644
index 0000000000..4eac158b62
--- /dev/null
+++ b/system/macemu/files/BasiliskII.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="485.43735"
+   height="562.31342"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="disegno.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.66833139"
+     inkscape:cx="-212.4745"
+     inkscape:cy="-6.9383877"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1648"
+     inkscape:window-height="1032"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="5"
+     fit-margin-left="5"
+     fit-margin-right="5"
+     fit-margin-bottom="5" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Livello 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-16.349841,-20.361317)">
+    <g
+       id="g3948"
+       transform="translate(1119.2053,1.4962637)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3147"
+         d="m -870.21277,158.95793 c 0,0 48.51402,-2.23911 85.83249,-41.79669 36.5721,-47.767646 28.36204,-93.296187 28.36204,-93.296187 0,0 -49.26038,2.239109 -86.57885,46.274907 -32.46234,40.60896 -27.61568,88.81797 -27.61568,88.81797 z"
+         style="fill:#61bb46;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path3149"
+         d="m -1073.2253,221.65296 415.72783,0 c 5.97096,-5.97096 10.44918,-8.21006 19.40561,-11.19554 0,0 -43.99764,-58.21682 -109.71631,-58.21682 -54.48497,0 -52.97061,23.88383 -104.49173,23.88383 -51.58596,0 -49.70135,-24.6302 -108.22357,-24.6302 -65.71863,0 -112.70183,70.15873 -112.70183,70.15873 z"
+         style="fill:#61bb46;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3151"
+         d="m -1073.2253,221.65296 c -10.4491,16.42013 -20.8983,50.75312 -23.8838,71.65147 l 397.81494,0 c 3.73185,-22.39108 23.88382,-59.70956 41.79669,-71.65147 z"
+         style="fill:#fdb827;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3153"
+         d="m -1097.1091,292.55806 c -1.4927,23.13745 -0.7464,43.28943 2.2391,70.9051 l 403.78591,0 c -8.95643,-26.12293 -11.94192,-45.52854 -8.21007,-70.15873 z"
+         style="fill:#f5821f;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path3174"
+         d="m -1094.87,363.46316 404.53228,0 c 10.44917,32.09389 40.30395,55.97772 67.91962,64.18778 l -2.23911,5.97095 -450.80719,0 c -11.1955,-23.13745 -15.6737,-46.27491 -19.4056,-70.15873 z"
+         style="fill:#e03a3e;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3176"
+         d="m -1076.2107,433.62189 450.80712,0 c -8.21006,24.63019 -25.37656,51.49949 -38.06484,69.41236 l -375.42388,0 c -14.181,-19.40561 -29.8548,-45.52854 -37.3184,-69.41236 z"
+         style="fill:#963d97;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path3178"
+         d="m -1038.8923,503.03425 375.42388,0 c 0,0 -44.78217,73.14421 -93.29619,73.14421 -41.05032,0 -47.01515,-23.88382 -92.54981,-23.88382 -47.77348,0 -54.3187,23.88382 -96.28166,23.88382 -38.87575,0 -80.60792,-47.76765 -93.29622,-73.14421 z"
+         style="fill:#009ddc;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/system/macemu/files/SheepShaver.desktop b/system/macemu/files/SheepShaver.desktop
new file mode 100644
index 0000000000..1664f188cf
--- /dev/null
+++ b/system/macemu/files/SheepShaver.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=SheepShaver
+Comment=An Open Source PowerPC MacOS run-time environment
+Icon=SheepShaver
+Exec=SheepShaver
+Terminal=false
+Type=Application
+Categories=System;
+StartupNotify=true
diff --git a/system/macemu/files/SheepShaver.png b/system/macemu/files/SheepShaver.png
new file mode 100644
index 0000000000..957a29542a
--- /dev/null
+++ b/system/macemu/files/SheepShaver.png
diff --git a/system/macemu/macemu.SlackBuild b/system/macemu/macemu.SlackBuild
new file mode 100644
index 0000000000..bfef813278
--- /dev/null
+++ b/system/macemu/macemu.SlackBuild
@@ -0,0 +1,157 @@
+#!/bin/sh
+
+# Slackware build script for macemu (BasiliskII and SheepShaver)
+# Copyright 2014-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=macemu
+VERSION=${VERSION:-20140919_c2b519e}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+PRGNAM1=BasiliskII
+PRGNAM2=SheepShaver
+DOCS1="COPYING ChangeLog README TECH TODO"
+DOCS2="COPYING NEWS doc/Linux doc/PowerPC-Testsuite.txt"
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+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 {} \;
+
+# Build BasiliskII
+cd $PRGNAM1/src/Unix
+
+NO_CONFIGURE=1 ./autogen.sh 
+
+#LDFLAGS="-L/usr/lib$LIBDIRSUFFIX -lXext -lX11" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --enable-jit=yes \
+  --disable-vosf \
+  --enable-sdl-audio=yes \
+  --enable-sdl-video=yes \
+  --with-mon=no \
+  --with-x \
+  --without-esd \
+  --host=$ARCH-slackware-linux \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+cd -
+
+# SheepShaver is built with jit disabled by default on x86_64
+# or we get a relocation error
+if [ "$ARCH" = "x86_64" ]; then jit="no"; else jit="yes"; fi
+
+cd $PRGNAM2/src/Unix
+
+NO_CONFIGURE=1 ./autogen.sh 
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --enable-jit=$jit \
+  --disable-vosf \
+  --enable-sdl-audio=yes \
+  --enable-sdl-video=yes \
+  --with-mon=no \
+  --with-x \
+  --without-esd \
+  --host=$ARCH-slackware-linux \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+cd -
+
+# Install some desktop files and icons
+install -m 0644 -D $CWD/files/$PRGNAM2.desktop \
+  $PKG/usr/share/applications/$PRGNAM2.desktop
+install -m 0644 -D $CWD/files/$PRGNAM2.png \
+  $PKG/usr/share/pixmaps/$PRGNAM2.png
+install -m 0644 -D $CWD/files/$PRGNAM1.desktop \
+  $PKG/usr/share/applications/$PRGNAM1.desktop
+install -m 0644 -D $CWD/files/$PRGNAM1.svg \
+  $PKG/usr/share/pixmaps/$PRGNAM1.svg
+
+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
+
+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/$PRGNAM-$VERSION/$PRGNAM1
+( cd $PRGNAM1
+  cp -a $DOCS1 $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM1 )
+( cd $PRGNAM2 
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM2
+  cp -a $DOCS2 $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM2 )
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/macemu/macemu.info b/system/macemu/macemu.info
new file mode 100644
index 0000000000..6e9a651e28
--- /dev/null
+++ b/system/macemu/macemu.info
@@ -0,0 +1,10 @@
+PRGNAM="macemu"
+VERSION="20140919_c2b519e"
+HOMEPAGE="http://basilisk.cebix.net/"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/macemu-20140919_c2b519e.tar.xz"
+MD5SUM="bfec35f83efe8a71f059872cf23698fd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/macemu/slack-desc b/system/macemu/slack-desc
new file mode 100644
index 0000000000..afc90df7a7
--- /dev/null
+++ b/system/macemu/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------------------------------------------------------|
+macemu: macemu (68k Macintosh Emulator)
+macemu:
+macemu: BasiliskII and SheepShaver are two Open Source 68k and PowerPC
+macemu: Macintosh emulators.
+macemu: They allow you to run 68k and PowerPC MacOS software on your computer,
+macemu: however you still need a copy of MacOS and a Macintosh ROM image to
+macemu: use it.
+macemu:
+macemu: homepage: http://basilisk.cebix.net/
+macemu:           http://sheepshaver.cebix.net/
+macemu:
diff --git a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild
index 80e3e188d4..9fde2d4d5d 100644
--- a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild
+++ b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for nvidia-legacy173-kernel
 
 # Copyright 2007-2010 Heinz Wiesinger, Amsterdam, The Netherlands
+
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +24,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Thanks to Robby Workman for suggestions to improve this script.
+# Thanks to previous maintainer Edward Koenig <kingbeowulf[at]gmail.com>
 
-# Maintainer Edward Koenig <kingbeowulf[at]gmail.com>
+# Maintainer for 14.2: David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=nvidia-legacy173-kernel
 VERSION=173.14.38
@@ -46,6 +48,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=${PKG:-$TMP/package-$PRGNAM}
+OUTPUT=${OUTPUT:-/tmp}
+
 if [ "$ARCH" = "i486" ]; then
   TARGET="x86"
 elif [ "$ARCH" = "i686" ]; then
@@ -53,33 +60,35 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   TARGET="x86_64"
   NVPKG="pkg2"
+else
+  echo "Unsupported ARCH: $ARCH"
+  exit 1
 fi
-
 unset ARCH
 
-SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-$NVPKG
+set -e
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
-OUTPUT=${OUTPUT:-/tmp}
+SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-$NVPKG
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $SRCNAM
-sh $CWD/$SRCNAM.run --extract-only || exit 1
-cd $SRCNAM || exit 1
+sh $CWD/$SRCNAM.run --extract-only
+cd $SRCNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Consolidated patch to build against Linux kernel 4.0
+patch -p1 < $CWD/nvidia-legacy173_kernel-4.0.patch
 
-cd usr/src/nv/ || exit 1
+cd usr/src/nv/
 
-make SYSSRC=$KERNELPATH module || exit 1
+make SYSSRC=$KERNELPATH module
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
 install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
diff --git a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.info b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.info
index 0914fa8074..d8b6a83fd5 100644
--- a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.info
+++ b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.info
@@ -6,5 +6,5 @@ MD5SUM="5bd4542cce1d81ef2b69f6df809df683"
 DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.38/NVIDIA-Linux-x86_64-173.14.38-pkg2.run"
 MD5SUM_x86_64="1a323da89be7d37e324b44e22b423692"
 REQUIRES=""
-MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/system/nvidia-legacy173-kernel/nvidia-legacy173_kernel-4.0.patch b/system/nvidia-legacy173-kernel/nvidia-legacy173_kernel-4.0.patch
new file mode 100644
index 0000000000..89ab9e592b
--- /dev/null
+++ b/system/nvidia-legacy173-kernel/nvidia-legacy173_kernel-4.0.patch
@@ -0,0 +1,206 @@
+diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/Makefile.kbuild
+--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/Makefile.kbuild	2013-08-28 21:53:41.000000000 +0100
++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/Makefile.kbuild	2015-08-28 10:37:23.726119728 +0100
+@@ -163,7 +163,6 @@
+ 	ioremap_wc \
+ 	proc_dir_entry \
+ 	acpi_walk_namespace \
+-	acpi_os_wait_events_complete \
+ 	agp_memory \
+ 	scatterlist \
+ 	file_operations \
+diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/conftest.sh
+--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/conftest.sh	2013-08-28 21:53:41.000000000 +0100
++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/conftest.sh	2015-08-28 10:37:29.870148375 +0100
+@@ -943,7 +943,7 @@
+             # and how many arguments it takes.
+             #
+             echo "$CONFTEST_PREAMBLE
+-            #include <acpi/acpi.h>
++            #include <linux/acpi.h>
+             void conftest_acpi_walk_namespace(void) {
+                 acpi_walk_namespace();
+             }" > conftest$$.c
+@@ -958,7 +958,7 @@
+             fi
+ 
+             echo "$CONFTEST_PREAMBLE
+-            #include <acpi/acpi.h>
++            #include <linux/acpi.h>
+             void conftest_acpi_walk_namespace(void) {
+                 acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL);
+             }" > conftest$$.c
+@@ -974,7 +974,7 @@
+             fi
+ 
+             echo "$CONFTEST_PREAMBLE
+-            #include <acpi/acpi.h>
++            #include <linux/acpi.h>
+             void conftest_acpi_walk_namespace(void) {
+                 acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL);
+             }" > conftest$$.c
+@@ -992,61 +992,6 @@
+             fi
+         ;;
+ 
+-        acpi_os_wait_events_complete)
+-            #
+-            # Determine if the acpi_os_wait_events_complete() function
+-            # is present and how many arguments it takes.
+-            #
+-            echo "$CONFTEST_PREAMBLE
+-            #include <linux/acpi.h>
+-            void conftest_acpi_os_wait_events_complete(void) {
+-                acpi_os_wait_events_complete(NULL, NULL);
+-            }" > conftest$$.c
+-
+-            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+-            rm -f conftest$$.c
+-
+-            if [ -f conftest$$.o ]; then
+-                rm -f conftest$$.o
+-                echo "#undef NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h
+-                return
+-            fi
+-
+-            echo "$CONFTEST_PREAMBLE
+-            #include <linux/acpi.h>
+-            void conftest_acpi_os_wait_events_complete(void) {
+-                acpi_os_wait_events_complete(NULL);
+-            }" > conftest$$.c
+-
+-            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+-            rm -f conftest$$.c
+-
+-            if [ -f conftest$$.o ]; then
+-                rm -f conftest$$.o
+-                echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h
+-                echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 1" >> conftest.h
+-                return
+-            fi
+-
+-            echo "$CONFTEST_PREAMBLE
+-            #include <linux/acpi.h>
+-            void conftest_acpi_os_wait_events_complete(void) {
+-                acpi_os_wait_events_complete();
+-            }" > conftest$$.c
+-
+-            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+-            rm -f conftest$$.c
+-
+-            if [ -f conftest$$.o ]; then
+-                rm -f conftest$$.o
+-                echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h
+-                echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 0" >> conftest.h
+-                return
+-            else
+-                echo "#error acpi_os_wait_events_complete() conftest failed!" >> conftest.h
+-            fi
+-        ;;
+-
+         ioremap_cache)
+             #
+             # Determine if the ioremap_cache() function is present.
+diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nv-linux.h NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nv-linux.h
+--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nv-linux.h	2013-08-28 21:53:41.000000000 +0100
++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nv-linux.h	2015-08-28 10:37:23.727119733 +0100
+@@ -206,8 +206,7 @@
+ #endif
+ 
+ #if defined(CONFIG_ACPI) 
+-#include <acpi/acpi.h>
+-#include <acpi/acpi_drivers.h>
++#include <linux/acpi.h>
+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
+ #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
+ #endif
+@@ -225,19 +224,6 @@
+ #error "NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT value unrecognized!"
+ #endif
+ 
+-#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
+-#if defined(KERNEL_2_4) || \
+-  (NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT == 1)
+-#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE() \
+-    acpi_os_wait_events_complete(NULL)
+-#elif (NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT == 0)
+-#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE() \
+-    acpi_os_wait_events_complete()
+-#else
+-#error "NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT value unrecognized!"
+-#endif
+-#endif
+-
+ #if defined(CONFIG_PREEMPT_RT)
+ typedef atomic_spinlock_t         nv_spinlock_t;
+ #define NV_SPIN_LOCK_INIT(lock)   atomic_spin_lock_init(lock)
+diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nv.c NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nv.c
+--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nv.c	2013-08-28 21:53:41.000000000 +0100
++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nv.c	2015-08-28 10:37:41.374201994 +0100
+@@ -841,8 +841,13 @@
+     unsigned long cr0 = read_cr0();
+     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
+     wbinvd();
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++    *cr4 = __read_cr4();
++    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
++#else
+     *cr4 = read_cr4();
+     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
++#endif
+     __flush_tlb();
+ }
+ 
+@@ -852,7 +857,11 @@
+     wbinvd();
+     __flush_tlb();
+     write_cr0((cr0 & 0x9fffffff));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++    if (cr4 & 0x80) __write_cr4(cr4);
++#else
+     if (cr4 & 0x80) write_cr4(cr4);
++#endif
+ }
+ 
+ static int __determine_pat_mode()
+@@ -2746,7 +2755,7 @@
+     unsigned long i_arg
+ )
+ {
+-    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+ 
+ long nv_kern_compat_ioctl(
+@@ -2755,7 +2764,7 @@
+     unsigned long i_arg
+ )
+ {
+-    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+ 
+ /*
+diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nvacpi.c NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nvacpi.c
+--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nvacpi.c	2013-08-28 21:53:41.000000000 +0100
++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nvacpi.c	2015-08-28 10:37:23.726119728 +0100
+@@ -14,6 +14,10 @@
+ #include "os-interface.h"
+ #include "nv-linux.h"
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
++#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
++#endif
++
+ #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
+ 
+ /*
+@@ -259,8 +263,6 @@
+ 
+     if (pNvAcpiObject->notify_handler_installed)
+     {
+-        NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
+-
+         // remove event notifier
+         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
+     }
diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild
index 736b14a069..837e6209fb 100644
--- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild
+++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild
@@ -24,8 +24,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Thanks to Robby Workman for suggestions to improve this script.
+# Thanks to previous maintainer Edward Koenig <kingbeowulf[at]gmail.com>
 
-# Maintainer: Edward Koenig <kingbeowulf[at]gmail.com>
+# Maintainer for 14.2: David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=nvidia-legacy96-kernel
 VERSION=96.43.23
@@ -47,6 +48,10 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=${PKG:-$TMP/package-$PRGNAM}
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   TARGET="x86"
@@ -55,37 +60,35 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   TARGET="x86_64"
   NVPKG="pkg2"
+else
+  echo "Unsupported ARCH: $ARCH"
+  exit 1
 fi
-
 unset ARCH
 
-SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-$NVPKG
+set -e
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
-OUTPUT=${OUTPUT:-/tmp}
+SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-$NVPKG
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $SRCNAM
-sh $CWD/$SRCNAM.run --extract-only || exit 1
-cd $SRCNAM || exit 1
+sh $CWD/$SRCNAM.run --extract-only
+cd $SRCNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cd usr/src/nv/ || exit 1
+# Consolidated patch to build against Linux kernel 4.0
+patch -p1 < $CWD/nvidia-legacy96_kernel-4.0.patch
 
-# backported patches courtesy of https://aur.archlinux.org/packages/nvidia-96xx/
-patch -p1 -i $CWD/patches/173.14.36-37.patch || exit 1
-patch -p1 -i $CWD/patches/173.14.37-38.patch || exit 1
+cd usr/src/nv/
 
-make SYSSRC=$KERNELPATH module || exit 1
+make SYSSRC=$KERNELPATH module
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
 install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info
index b3d93e9698..e51ce26e06 100644
--- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info
+++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info
@@ -6,5 +6,5 @@ MD5SUM="21f6eb657e651a83ff4271438122b379"
 DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.23/NVIDIA-Linux-x86_64-96.43.23-pkg2.run"
 MD5SUM_x86_64="dd8546e5ae7d10da072306e5f13952b8"
 REQUIRES=""
-MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/system/nvidia-legacy96-kernel/patches/173.14.37-38.patch b/system/nvidia-legacy96-kernel/nvidia-legacy96_kernel-4.0.patch
index bd8e94ce95..f3aac5677e 100644
--- a/system/nvidia-legacy96-kernel/patches/173.14.37-38.patch
+++ b/system/nvidia-legacy96-kernel/nvidia-legacy96_kernel-4.0.patch
@@ -1,7 +1,97 @@
-diff -pur 1/conftest.sh 2/conftest.sh
---- 1/conftest.sh	2012-09-01 02:04:44.000000000 +0400
-+++ 2/conftest.sh	2013-09-17 20:11:54.586886368 +0400
-@@ -1202,6 +1202,99 @@ compile_test() {
+diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/Makefile.kbuild
+--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/Makefile.kbuild	2012-09-01 11:48:26.000000000 +0100
++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/Makefile.kbuild	2015-08-28 10:57:54.455966846 +0100
+@@ -189,7 +189,11 @@
+ 	agp_memory \
+ 	scatterlist \
+ 	file_operations \
+-	sg_init_table
++	sg_init_table \
++	proc_create_data \
++	pde_data \
++	proc_remove \
++	get_num_physpages
+ else
+  COMPILE_TESTS = \
+ 	remap_page_range \
+diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/Makefile.nvidia NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/Makefile.nvidia
+--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/Makefile.nvidia	2012-09-01 11:48:26.000000000 +0100
++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/Makefile.nvidia	2015-08-28 10:57:54.455966846 +0100
+@@ -62,7 +62,10 @@
+ 	smp_call_function \
+ 	proc_dir_entry \
+ 	scatterlist \
+-	file_operations
++	file_operations \
++	proc_create_data \
++	pde_data \
++	proc_remove
+ 
+ DEFINES+=$(EXTRA_DEFINES)
+ 
+diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/conftest.sh
+--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/conftest.sh	2012-09-01 11:48:26.000000000 +0100
++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/conftest.sh	2015-08-28 10:58:10.815050413 +0100
+@@ -128,6 +128,7 @@
+         if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
++            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
+         fi
+         if [ "$XEN_PRESENT" != "0" ]; then
+             MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
+@@ -137,16 +138,21 @@
+         if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
++            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
+         fi
+         if [ "$XEN_PRESENT" != "0" ]; then
+             MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
+         fi
+     fi
+ 
+-    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS $AUTOCONF_CFLAGS"
++    CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi -I$OUTPUT/include/generated/uapi"
+ 
+     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+-        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
++        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
++        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi"
++        CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
++        CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
+     fi
+     if [ -n "$BUILD_PARAMS" ]; then
+         CFLAGS="$CFLAGS -D$BUILD_PARAMS"
+@@ -938,7 +944,7 @@
+             # and how many arguments it takes.
+             #
+             echo "$CONFTEST_PREAMBLE
+-            #include <acpi/acpi.h>
++            #include <linux/acpi.h>
+             void conftest_acpi_walk_namespace(void) {
+                 acpi_walk_namespace();
+             }" > conftest$$.c
+@@ -953,7 +959,7 @@
+             fi
+ 
+             echo "$CONFTEST_PREAMBLE
+-            #include <acpi/acpi.h>
++            #include <linux/acpi.h>
+             void conftest_acpi_walk_namespace(void) {
+                 acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL);
+             }" > conftest$$.c
+@@ -969,7 +975,7 @@
+             fi
+ 
+             echo "$CONFTEST_PREAMBLE
+-            #include <acpi/acpi.h>
++            #include <linux/acpi.h>
+             void conftest_acpi_walk_namespace(void) {
+                 acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL);
+             }" > conftest$$.c
+@@ -1202,6 +1208,99 @@
              fi
          ;;
  
@@ -101,41 +191,83 @@ diff -pur 1/conftest.sh 2/conftest.sh
      esac
  }
  
-diff -pur 1/Makefile.kbuild 2/Makefile.kbuild
---- 1/Makefile.kbuild	2012-09-01 02:04:44.000000000 +0400
-+++ 2/Makefile.kbuild	2013-09-17 20:11:54.586886368 +0400
-@@ -189,7 +189,11 @@ ifneq ($(PATCHLEVEL), 4)
- 	agp_memory \
- 	scatterlist \
- 	file_operations \
--	sg_init_table
-+	sg_init_table \
-+	proc_create_data \
-+	pde_data \
-+	proc_remove \
-+	get_num_physpages
- else
-  COMPILE_TESTS = \
- 	remap_page_range \
-diff -pur 1/Makefile.nvidia 2/Makefile.nvidia
---- 1/Makefile.nvidia	2012-09-01 02:04:44.000000000 +0400
-+++ 2/Makefile.nvidia	2013-09-17 20:11:54.586886368 +0400
-@@ -62,7 +62,10 @@ COMPILE_TESTS = \
- 	smp_call_function \
- 	proc_dir_entry \
- 	scatterlist \
--	file_operations
-+	file_operations \
-+	proc_create_data \
-+	pde_data \
-+	proc_remove
+@@ -1407,7 +1506,8 @@
+         FILE="linux/version.h"
+         SELECTED_MAKEFILE=""
  
- DEFINES+=$(EXTRA_DEFINES)
+-        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
++        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE -o \
++             -f $OUTPUT/include/generated/uapi/$FILE ]; then
+             #
+             # We are either looking at a configured kernel source
+             # tree or at headers shipped for a specific kernel.
+diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv-i2c.c NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv-i2c.c
+--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv-i2c.c	2012-09-01 11:48:26.000000000 +0100
++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv-i2c.c	2015-08-28 10:57:54.456966851 +0100
+@@ -285,8 +285,6 @@
+ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
+ {
+     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
+-    int osstatus = 0;
+-    BOOL wasReleased = FALSE;
  
-diff -pur 1/nv.c 2/nv.c
---- 1/nv.c	2012-09-01 02:04:44.000000000 +0400
-+++ 2/nv.c	2013-09-17 20:25:21.970607458 +0400
-@@ -163,6 +163,91 @@ static int          nvl_remove_alloc(nv_
+ #if defined(KERNEL_2_4)
+     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
+@@ -297,16 +295,11 @@
+ 
+     if (!pI2cAdapter) return FALSE;
+ 
+-    // attempt release with the OS
+-    osstatus = i2c_del_adapter(pI2cAdapter);
++    // release with the OS
++    i2c_del_adapter(pI2cAdapter);
++    os_free_mem(pI2cAdapter);
+ 
+-    if (!osstatus)
+-    {
+-        os_free_mem(pI2cAdapter);
+-        wasReleased = TRUE;
+-    }
+-
+-    return wasReleased;
++    return TRUE;
+ }
+ 
+ #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
+diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv-linux.h NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv-linux.h
+--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv-linux.h	2012-09-01 11:48:26.000000000 +0100
++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv-linux.h	2015-08-28 10:57:54.457966856 +0100
+@@ -64,6 +64,18 @@
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+ 
++#include <linux/mm.h>
++
++#if !defined(VM_RESERVED)
++#define VM_RESERVED    0x00000000
++#endif
++#if !defined(VM_DONTEXPAND)
++#define VM_DONTEXPAND  0x00000000
++#endif
++#if !defined(VM_DONTDUMP)
++#define VM_DONTDUMP    0x00000000
++#endif
++
+ #include <linux/init.h>             /* module_init, module_exit         */
+ #include <linux/types.h>            /* pic_t, size_t, __u32, etc        */
+ #include <linux/errno.h>            /* error codes                      */
+@@ -128,6 +140,7 @@
+ 
+ #ifdef CONFIG_PROC_FS
+ #include <linux/proc_fs.h>
++#include <linux/seq_file.h>
+ #endif
+ 
+ #ifdef CONFIG_MTRR
+diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv.c NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv.c
+--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv.c	2012-09-01 11:48:26.000000000 +0100
++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv.c	2015-08-28 10:58:21.135103128 +0100
+@@ -163,6 +163,91 @@
  /* lock-related functions that should only be called from this file */
  static void nv_lock_init_locks(nv_state_t *nv);
  
@@ -227,7 +359,7 @@ diff -pur 1/nv.c 2/nv.c
  
  /***
   *** EXPORTS to Linux Kernel
-@@ -190,13 +275,6 @@ void          nv_kern_rc_timer(unsigned
+@@ -190,13 +275,6 @@
  static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
  #endif
  
@@ -241,7 +373,7 @@ diff -pur 1/nv.c 2/nv.c
  int           nv_kern_ctl_open(struct inode *, struct file *);
  int           nv_kern_ctl_close(struct inode *, struct file *);
  unsigned int  nv_kern_ctl_poll(struct file *, poll_table *);
-@@ -490,156 +568,17 @@ static struct pci_dev* nv_get_pci_device
+@@ -490,156 +568,17 @@
      return NULL;
  }
  
@@ -406,7 +538,7 @@ diff -pur 1/nv.c 2/nv.c
  static void
  nvos_proc_add_text_file(
      struct proc_dir_entry *parent,
-@@ -647,26 +586,15 @@ nvos_proc_add_text_file(
+@@ -647,26 +586,15 @@
      const char *text
  )
  {
@@ -437,7 +569,7 @@ diff -pur 1/nv.c 2/nv.c
      while (entry) {
          struct proc_dir_entry *next = entry->next;
          if (entry->subdir)
-@@ -676,6 +604,7 @@ static void nvos_proc_remove_all(struct
+@@ -676,6 +604,7 @@
              break;
          entry = next;
      }
@@ -445,7 +577,71 @@ diff -pur 1/nv.c 2/nv.c
  }
  #endif
  
-@@ -2848,18 +2777,17 @@ void   NV_API_CALL  nv_set_dma_address_s
+@@ -797,8 +726,13 @@
+     unsigned long cr0 = read_cr0();
+     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
+     wbinvd();
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++    *cr4 = __read_cr4();
++    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
++#else
+     *cr4 = read_cr4();
+     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
++#endif
+     __flush_tlb();
+ }
+ 
+@@ -808,7 +742,11 @@
+     wbinvd();
+     __flush_tlb();
+     write_cr0((cr0 & 0x9fffffff));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++    if (cr4 & 0x80) __write_cr4(cr4);
++#else
+     if (cr4 & 0x80) write_cr4(cr4);
++#endif
+ }
+ 
+ static int __determine_pat_mode()
+@@ -2348,9 +2286,8 @@
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+         nv_vm_list_page_count(&at->page_table[i], pages);
+ 
+-        /* prevent the swapper from swapping it out */
+-        /* mark the memory i/o so the buffers aren't dumped on core dumps */
+         vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
++        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
+     }
+ 
+     NV_VMA_FILE(vma) = file;
+@@ -2370,7 +2307,7 @@
+ 
+     nvl = NVL_FROM_FILEP(file);
+ 
+-    if (NV_IS_CONTROL_DEVICE(file->f_dentry->d_inode))
++    if (NV_IS_CONTROL_DEVICE(file->f_path.dentry->d_inode))
+         return nv_kern_ctl_poll(file, wait);
+ 
+     nvfp = NV_GET_NVFP(file);
+@@ -2565,7 +2502,7 @@
+     unsigned long i_arg
+ )
+ {
+-    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+ 
+ long nv_kern_compat_ioctl(
+@@ -2574,7 +2511,7 @@
+     unsigned long i_arg
+ )
+ {
+-    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+ 
+ /*
+@@ -2848,18 +2785,17 @@
  }
  
  static int
@@ -470,7 +666,7 @@ diff -pur 1/nv.c 2/nv.c
      dev = nv_get_pci_device(nv);
      if (!dev)
          return 0;
-@@ -2869,61 +2797,61 @@ nv_kern_read_cardinfo(char *page, char *
+@@ -2869,61 +2805,61 @@
          strcpy (tmpstr, "Unknown");
      }
      
@@ -559,7 +755,7 @@ diff -pur 1/nv.c 2/nv.c
  
      if (nv) {
          dev = nv_get_pci_device(nv);
-@@ -2934,13 +2862,12 @@ nv_kern_read_agpinfo(char *page, char **
+@@ -2934,13 +2870,12 @@
          if (!dev)
              return 0;
  
@@ -576,7 +772,7 @@ diff -pur 1/nv.c 2/nv.c
  #endif
      }
  
-@@ -2953,40 +2880,40 @@ nv_kern_read_agpinfo(char *page, char **
+@@ -2953,40 +2888,40 @@
      fw  = (status & 0x00000010) ? "Supported" : "Not Supported";
      sba = (status & 0x00000200) ? "Supported" : "Not Supported";
  
@@ -630,7 +826,7 @@ diff -pur 1/nv.c 2/nv.c
      dev = nvos_get_agp_device_by_class(PCI_CLASS_BRIDGE_HOST);
      if (!dev)
          return 0;
-@@ -3007,10 +2934,10 @@ nv_kern_read_status(char *page, char **s
+@@ -3007,10 +2942,10 @@
      command &= scratch;
  
      if (NV_AGP_ENABLED(nv) && (command & 0x100)) {
@@ -643,7 +839,7 @@ diff -pur 1/nv.c 2/nv.c
  
          // mask off agp rate. 
          // If this is agp 3.0, we need to shift the value
-@@ -3018,17 +2945,17 @@ nv_kern_read_status(char *page, char **s
+@@ -3018,17 +2953,17 @@
          if (status & 0x8) // agp 3.0
              agp_rate <<= 2;
  
@@ -665,7 +861,7 @@ diff -pur 1/nv.c 2/nv.c
  
          /*
           * If we find AGP is disabled, but the RM registry indicates it
-@@ -3042,7 +2969,7 @@ nv_kern_read_status(char *page, char **s
+@@ -3042,7 +2977,7 @@
          rm_read_registry_dword(nv, "NVreg", "XNvAGP", &agp_config);
  
          if (agp_config != NVOS_AGP_CONFIG_DISABLE_AGP && NV_AGP_FAILED(nv)) {
@@ -674,7 +870,7 @@ diff -pur 1/nv.c 2/nv.c
                    "AGP initialization failed, please check the ouput  \n"
                    "of the 'dmesg' command and/or your system log file \n"
                    "for additional information on this problem.        \n");
-@@ -3050,35 +2977,133 @@ nv_kern_read_status(char *page, char **s
+@@ -3050,35 +2985,133 @@
      }
  
      NV_PCI_DEV_PUT(dev);
@@ -822,54 +1018,10 @@ diff -pur 1/nv.c 2/nv.c
  }
  
  /***
-diff -pur 1/nv-i2c.c 2/nv-i2c.c
---- 1/nv-i2c.c	2012-09-01 02:04:44.000000000 +0400
-+++ 2/nv-i2c.c	2013-09-17 20:11:54.590219538 +0400
-@@ -285,8 +285,6 @@ void* NV_API_CALL nv_i2c_add_adapter(nv_
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
- #if defined(KERNEL_2_4)
-     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -297,16 +295,11 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_s
- 
-     if (!pI2cAdapter) return FALSE;
- 
--    // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
-+    // release with the OS
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
--
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -pur 1/nv-linux.h 2/nv-linux.h
---- 1/nv-linux.h	2012-09-01 02:04:44.000000000 +0400
-+++ 2/nv-linux.h	2013-09-17 20:11:54.590219538 +0400
-@@ -128,6 +128,7 @@
- 
- #ifdef CONFIG_PROC_FS
- #include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
- #endif
- 
- #ifdef CONFIG_MTRR
-diff -pur 1/os-interface.c 2/os-interface.c
---- 1/os-interface.c	2012-09-01 02:04:44.000000000 +0400
-+++ 2/os-interface.c	2013-09-17 20:11:54.590219538 +0400
-@@ -261,7 +261,15 @@ NvU64 NV_API_CALL os_get_page_mask(void)
+diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/os-interface.c NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/os-interface.c
+--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/os-interface.c	2012-09-01 11:48:26.000000000 +0100
++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/os-interface.c	2015-08-28 10:57:54.457966856 +0100
+@@ -261,7 +261,15 @@
  
  NvU64 NV_API_CALL os_get_system_memory_size(void)
  {
diff --git a/system/nvidia-legacy96-kernel/patches/173.14.36-37.patch b/system/nvidia-legacy96-kernel/patches/173.14.36-37.patch
deleted file mode 100644
index 843259aea7..0000000000
--- a/system/nvidia-legacy96-kernel/patches/173.14.36-37.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -pur 173.14.36/conftest.sh 173.14.37/conftest.sh
---- 173.14.36/conftest.sh	2012-09-11 23:36:21.000000000 +0400
-+++ 173.14.37/conftest.sh	2013-03-07 05:17:45.000000000 +0400
-@@ -127,6 +127,7 @@ build_cflags() {
-         if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-+            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
-         fi
-         if [ "$XEN_PRESENT" != "0" ]; then
-             MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
-@@ -136,16 +137,21 @@ build_cflags() {
-         if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-+            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
-         fi
-         if [ "$XEN_PRESENT" != "0" ]; then
-             MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
-         fi
-     fi
- 
--    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS $AUTOCONF_CFLAGS"
-+    CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi -I$OUTPUT/include/generated/uapi"
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi"
-+        CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
-+        CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
-     fi
-     if [ -n "$BUILD_PARAMS" ]; then
-         CFLAGS="$CFLAGS -D$BUILD_PARAMS"
-@@ -1453,7 +1459,8 @@ case "$6" in
-         FILE="linux/version.h"
-         SELECTED_MAKEFILE=""
- 
--        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-+        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE -o \
-+             -f $OUTPUT/include/generated/uapi/$FILE ]; then
-             #
-             # We are either looking at a configured kernel source
-             # tree or at headers shipped for a specific kernel.
-diff -pur 173.14.36/nv.c 173.14.37/nv.c
---- 173.14.36/nv.c	2012-09-11 23:36:21.000000000 +0400
-+++ 173.14.37/nv.c	2013-03-07 05:17:44.000000000 +0400
-@@ -2607,9 +2607,8 @@ int nv_kern_mmap(
-         NV_PRINT_AT(NV_DBG_MEMINFO, at);
-         nv_vm_list_page_count(&at->page_table[i], pages);
- 
--        /* prevent the swapper from swapping it out */
--        /* mark the memory i/o so the buffers aren't dumped on core dumps */
-         vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
-     }
- 
-     NV_VMA_FILE(vma) = file;
-diff -pur 173.14.36/nv-linux.h 173.14.37/nv-linux.h
---- 173.14.36/nv-linux.h	2012-09-11 23:36:21.000000000 +0400
-+++ 173.14.37/nv-linux.h	2013-03-07 05:17:45.000000000 +0400
-@@ -64,6 +64,18 @@
- #include <linux/module.h>
- #include <linux/kmod.h>
- 
-+#include <linux/mm.h>
-+
-+#if !defined(VM_RESERVED)
-+#define VM_RESERVED    0x00000000
-+#endif
-+#if !defined(VM_DONTEXPAND)
-+#define VM_DONTEXPAND  0x00000000
-+#endif
-+#if !defined(VM_DONTDUMP)
-+#define VM_DONTDUMP    0x00000000
-+#endif
-+
- #include <linux/init.h>             /* module_init, module_exit         */
- #include <linux/types.h>            /* pic_t, size_t, __u32, etc        */
- #include <linux/errno.h>            /* error codes                      */
diff --git a/system/seahorse/seahorse.SlackBuild b/system/seahorse/seahorse.SlackBuild
index 60367a1102..a6264861bb 100644
--- a/system/seahorse/seahorse.SlackBuild
+++ b/system/seahorse/seahorse.SlackBuild
@@ -6,7 +6,7 @@
 # Updated to version 3.8.1 by Andrew Rowland
 
 PRGNAM=seahorse
-VERSION=${VERSION:-3.8.1}
+VERSION=${VERSION:-3.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/seahorse/seahorse.info b/system/seahorse/seahorse.info
index 42fe25e313..80455b3502 100644
--- a/system/seahorse/seahorse.info
+++ b/system/seahorse/seahorse.info
@@ -1,8 +1,8 @@
 PRGNAM="seahorse"
-VERSION="3.8.1"
+VERSION="3.16.0"
 HOMEPAGE="http://projects.gnome.org/seahorse/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.8/seahorse-3.8.1.tar.xz"
-MD5SUM="5f80effb99f418d09fffaf701409620c"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.16/seahorse-3.16.0.tar.xz"
+MD5SUM="3416abb33183285a5e69fe0a058c39de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/secure-delete/secure-delete.SlackBuild b/system/secure-delete/secure-delete.SlackBuild
index f511e7feb0..805ea8f139 100644
--- a/system/secure-delete/secure-delete.SlackBuild
+++ b/system/secure-delete/secure-delete.SlackBuild
@@ -72,7 +72,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p1 < $CWD/secure-delete.diff
-make prefix=/usr DESTDIR=$PKG
+make -j1 prefix=/usr 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
diff --git a/system/spice-vdagent/README b/system/spice-vdagent/README
new file mode 100644
index 0000000000..07292e9f81
--- /dev/null
+++ b/system/spice-vdagent/README
@@ -0,0 +1,8 @@
+spice-vdagent (spice agent for Linux vms)
+
+spice-vdagent enhanches interactions with your Linux virtual guests:
+- client mouse mode
+- automatic adjustment of the X-session resolution to the client's one
+- support of copy and paste
+- limited support for multiple displays using Xinerama
+- full support for multiple displays using Xrandr
diff --git a/system/spice-vdagent/doinst.sh b/system/spice-vdagent/doinst.sh
new file mode 100644
index 0000000000..97bb4e39c5
--- /dev/null
+++ b/system/spice-vdagent/doinst.sh
@@ -0,0 +1,37 @@
+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
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.spice-vdagent.new
+config usr/share/X11/xorg.conf.d/06-spice-vdagent.conf.new
+
+# If not already there, start the daemon from /etc/rc.d/rc.local
+if [ ! "$(grep rc\.spice-vdagent etc/rc.d/rc.local)" ]; then
+  cat << EOF >> etc/rc.d/rc.local
+
+# Start spice-vdagent:
+if [ -x /etc/rc.d/rc.spice-vdagent ]; then
+  /etc/rc.d/rc.spice-vdagent start
+fi
+EOF
+fi
diff --git a/system/spice-vdagent/files/06-spice-vdagent.conf b/system/spice-vdagent/files/06-spice-vdagent.conf
new file mode 100644
index 0000000000..f74be0db09
--- /dev/null
+++ b/system/spice-vdagent/files/06-spice-vdagent.conf
@@ -0,0 +1,37 @@
+Section "ServerLayout"
+	Identifier     "Default Layout"
+	Screen      0  "Screen0" 0 0
+	InputDevice    "Keyboard0" "CoreKeyboard"
+        InputDevice    "Mouse" "CorePointer"
+        InputDevice    "Tablet" "SendCoreEvents"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Keyboard0"
+	Driver      "kbd"
+	Option	    "XkbModel" "pc105"
+	Option	    "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+        Identifier  "Mouse"
+        Driver      "mouse"
+        Option      "Device" "/dev/input/mice"
+        #Option      "Emulate3Buttons" "yes"
+EndSection
+
+Section "InputDevice"
+        Identifier  "Tablet"
+        Driver      "evdev"
+        Option      "Device" "/dev/input/event3"
+EndSection
+
+Section "Screen"
+	Identifier "Screen0"
+	Device     "XSPICE"
+	DefaultDepth     24
+	SubSection "Display"
+		Viewport   0 0
+		Depth     24
+	EndSubSection
+EndSection
diff --git a/system/spice-vdagent/files/rc.spice-vdagent b/system/spice-vdagent/files/rc.spice-vdagent
new file mode 100644
index 0000000000..9c3ff19cc8
--- /dev/null
+++ b/system/spice-vdagent/files/rc.spice-vdagent
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# spice-vdagentd Agent daemon for Spice guests
+#
+# Red Hat specific script slightly adapted for the Slackware init system
+# by Matteo Bernardini <ponce@slackbuilds.org>
+#
+# Description: Together with a per X-session agent process the spice agent
+#	daemon enhances the spice guest user experience with client
+#	mouse mode, guest <-> client copy and paste support and more.
+
+exec="/usr/sbin/spice-vdagentd"
+prog="spice-vdagentd"
+port="/dev/virtio-ports/com.redhat.spice.0"
+pid="/var/run/spice-vdagentd/spice-vdagentd.pid"
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+  /sbin/modprobe uinput > /dev/null 2>&1
+  # In case the previous running vdagentd crashed
+  /usr/bin/rm -f /var/run/spice-vdagentd/spice-vdagent-sock
+  /usr/bin/echo "Starting $prog: "
+  $exec -s $port
+  retval=$?
+  /usr/bin/echo
+  [ $retval -eq 0 ] && echo "$(pidof $prog)" > $pid && /usr/bin/touch $lockfile
+  return $retval
+}
+
+stop() {
+  if [ "$(pidof $prog)" ]; then
+    /usr/bin/echo "Stopping $prog: "
+    /bin/kill $pid
+  else
+    /usr/bin/echo "$prog not running"
+    return 1
+  fi
+  retval=$?
+  /usr/bin/echo
+  [ $retval -eq 0 ] && rm -f $lockfile $pid
+  return $retval
+}
+
+restart() {
+  stop
+  start
+}
+
+case "$1" in
+  start)
+    $1
+    ;;
+  stop)
+    $1
+    ;;
+  restart)
+    $1
+    ;;
+  *)
+    /usr/bin/echo $"Usage: $0 {start|stop|restart}"
+    exit 2
+esac
+exit $?
diff --git a/system/spice-vdagent/slack-desc b/system/spice-vdagent/slack-desc
new file mode 100644
index 0000000000..f058ca3eb1
--- /dev/null
+++ b/system/spice-vdagent/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------------------------------------------------------|
+spice-vdagent: spice-vdagent (spice agent for Linux vms)
+spice-vdagent:
+spice-vdagent: spice-vdagent enhanches interactions with your Linux virtual guests:
+spice-vdagent: - client mouse mode
+spice-vdagent: - automatic adjustment of the X-session resolution to the client's one
+spice-vdagent: - support of copy and paste
+spice-vdagent: - limited support for multiple displays using Xinerama
+spice-vdagent: - full support for multiple displays using Xrandr
+spice-vdagent:
+spice-vdagent: homepage: http://spice-space.org
+spice-vdagent:
diff --git a/system/usbmuxd/usbmuxd.SlackBuild b/system/spice-vdagent/spice-vdagent.SlackBuild
index b27c9c1daf..0db5a0472e 100644
--- a/system/usbmuxd/usbmuxd.SlackBuild
+++ b/system/spice-vdagent/spice-vdagent.SlackBuild
@@ -1,12 +1,7 @@
 #!/bin/sh
 
-# Slackware build script for usbmuxd
-
-# Written by David Somero <dsomero@hotmail.com>
-# Derived from Slackware's Slackbuilds.
-#
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# Copyright 2010-2011  David Somero (dsomero@hotmail.com) Athens, TN, USA
+# Slackware build script for spice-vdagent
+# Copyright Matteo Bernardini <ponce@slackbuilds.org>, 2012
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -15,7 +10,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -26,8 +21,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=usbmuxd
-VERSION=${VERSION:-1.0.8}
+PRGNAM=spice-vdagent
+VERSION=${VERSION:-0.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,49 +53,47 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if ! grep -q ^usbmux: /etc/passwd 2>/dev/null ; then
-  echo "    Error: usbmux user doesn't exist."
-  echo "    Create one with: useradd -u 277 -g plugdev -d /dev/null -s /bin/false usbmux"
-  exit 1
-fi
+DOCS="COPYING ChangeLog README TODO"
 
-set -e
+set -e # Exit on most errors
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+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:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} ..
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-    make
-    make install DESTDIR=$PKG
-) || exit
+make
+make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-cat $CWD/85-usbmuxd.rules > $PKG/lib/udev/rules.d/85-usbmuxd.rules
+# Install an init script and an X.org configuration file
+install -m 0755 -D $CWD/files/rc.spice-vdagent \
+  $PKG/etc/rc.d/rc.spice-vdagent.new
+install -m 0644 -D $CWD/files/06-spice-vdagent.conf \
+  $PKG/usr/share/X11/xorg.conf.d/06-spice-vdagent.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README* COPYING* AUTHORS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/spice-vdagent/spice-vdagent.info b/system/spice-vdagent/spice-vdagent.info
new file mode 100644
index 0000000000..10de6d1b70
--- /dev/null
+++ b/system/spice-vdagent/spice-vdagent.info
@@ -0,0 +1,10 @@
+PRGNAM="spice-vdagent"
+VERSION="0.12.0"
+HOMEPAGE="http://spice-space.org"
+DOWNLOAD="http://spice-space.org/download/releases/spice-vdagent-0.12.0.tar.bz2"
+MD5SUM="a7de4d6682099b7af9c289ef3e2996f7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="spice xf86-video-qxl"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/spkg/README b/system/spkg/README
new file mode 100644
index 0000000000..7fa5b16865
--- /dev/null
+++ b/system/spkg/README
@@ -0,0 +1,4 @@
+spkg is an extremly fast package manager based on the idea
+of Slackware's pkgtools.
+It's implemented in C (everything is libified) and optimized
+for speed.
diff --git a/system/usbmuxd/slack-desc b/system/spkg/slack-desc
index 0c02337984..2345362d6e 100644
--- a/system/usbmuxd/slack-desc
+++ b/system/spkg/slack-desc
@@ -5,15 +5,15 @@
 # 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------------------------------------------------------|
-usbmuxd: usbmuxd (USB Multiplex Daemon)
-usbmuxd:
-usbmuxd: usbmuxd USB Multiplex Daemon. This bit of software is in charge of
-usbmuxd: talking to your iPhone or iPod Touch over USB and coordinating
-usbmuxd: access to its services by other applications.
-usbmuxd:
-usbmuxd:
-usbmuxd:
-usbmuxd:
-usbmuxd:
-usbmuxd:
+    |-----handy-ruler------------------------------------------------------|
+spkg: spkg (The Unofficial Slackware Linux Package Manager)
+spkg:
+spkg: spkg is an extremly fast package manager based on the idea
+spkg: of Slackware's pkgtools.
+spkg: It's implemented in C (everything is libified) and optimized
+spkg: for speed.
+spkg:
+spkg: homepage: http://spkg.megous.com
+spkg:
+spkg:
+spkg:
diff --git a/system/lzip/lzip.SlackBuild b/system/spkg/spkg.SlackBuild
index ba3af43f84..36395aa2aa 100644
--- a/system/lzip/lzip.SlackBuild
+++ b/system/spkg/spkg.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for lzip
+# Slackware build script for spkg
 
-# Copyright 2011 Barry J. Grundy <bgrundy(at)linuxleo.com>
+# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,19 @@
 # 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.
-
-# Updated for version 1.16 November 2014.
-
-PRGNAM=lzip
-VERSION=${VERSION:-1.16}
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=spkg
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,46 +54,43 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e   # exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
+./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
   --mandir=/usr/man \
-  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-make CFLAGS+="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 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
 
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README doc/ \
-    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/spkg/spkg.info b/system/spkg/spkg.info
new file mode 100644
index 0000000000..528bc275bd
--- /dev/null
+++ b/system/spkg/spkg.info
@@ -0,0 +1,10 @@
+PRGNAM="spkg"
+VERSION="1.0.1"
+HOMEPAGE="http://spkg.megous.com"
+DOWNLOAD="http://spkg.megous.com/dl/releases/spkg-1.0.1.tar.bz2"
+MD5SUM="96f52157593a30dd3b059ba8d8590fad"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="judy"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/truecrypt/truecrypt.SlackBuild b/system/truecrypt/truecrypt.SlackBuild
index d7c95da069..a0d55c176f 100644
--- a/system/truecrypt/truecrypt.SlackBuild
+++ b/system/truecrypt/truecrypt.SlackBuild
@@ -49,13 +49,12 @@ set -e
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+  SLKLDFLAGS=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+  SLKLDFLAGS=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
   SLKLDFLAGS="-L/usr/lib64"
 fi
 
@@ -71,15 +70,13 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-if [ $ARCH = "x86_64" ]; then
-   export LDFLAGS="$SLKLDFLAGS"
-fi
-export CXXFLAGS="$SLKCFLAGS"
-export CFLAGS="$SLKCFLAGS"
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Assume wxWidgets is already installed and we're linking dynamically.
+
+TC_EXTRA_CFLAGS="$SLKCFLAGS" \
+TC_EXTRA_CXXFLAGS="$SLKCFLAGS" \
+TC_EXTRA_LFLAGS="$SLKLDFLAGS -ldl" \
 make
 
 mkdir -p $PKG/usr/bin
diff --git a/system/usbmuxd/85-usbmuxd.rules b/system/usbmuxd/85-usbmuxd.rules
deleted file mode 100644
index 2fbf92c8a9..0000000000
--- a/system/usbmuxd/85-usbmuxd.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
-
-# Forces iPhone 1.0, 3G, 3GS and iPodTouch 1 and 2 to USB configuration 3 and run usbmuxd
-ACTION=="add", SUBSYSTEM=="usb", GROUP="plugdev", MODE="770", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9]", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="/usr/sbin/usbmuxd -u --user=usbmux"
-
-# Exit usbmuxd when the last phone is removed
-ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/system/usbmuxd/README b/system/usbmuxd/README
deleted file mode 100644
index fee3129706..0000000000
--- a/system/usbmuxd/README
+++ /dev/null
@@ -1,7 +0,0 @@
-usbmuxd: USB Multiplex Daemon. This bit of software is in charge of
-talking to your iPhone or iPod Touch over USB and coordinating access to
-its services by other applications.
-
-Before running this script, create a usbmux user with:
-  useradd -u 277 -g plugdev -d /dev/null -s /bin/false usbmux
-
diff --git a/system/usbmuxd/doinst.sh b/system/usbmuxd/doinst.sh
deleted file mode 100644
index 687cfbae4d..0000000000
--- a/system/usbmuxd/doinst.sh
+++ /dev/null
@@ -1 +0,0 @@
-chroot . /etc/rc.d/rc.udev reload
diff --git a/system/usbmuxd/usbmuxd.info b/system/usbmuxd/usbmuxd.info
deleted file mode 100644
index 52a41daeb3..0000000000
--- a/system/usbmuxd/usbmuxd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="usbmuxd"
-VERSION="1.0.8"
-HOMEPAGE="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-DOWNLOAD="http://www.libimobiledevice.org/downloads/usbmuxd-1.0.8.tar.bz2"
-MD5SUM="4b33cc78e479e0f9a6745f9b9a8b60a8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Somero"
-EMAIL="dsomero@hotmail.com"
diff --git a/system/vhba-module/slack-desc b/system/vhba-module/slack-desc
index f8bd56491d..8f4aaa353c 100644
--- a/system/vhba-module/slack-desc
+++ b/system/vhba-module/slack-desc
@@ -14,6 +14,6 @@ vhba-module: the SCSI layer with a virtual SCSI adapter which can have
 vhba-module: multiple virtual devices. It is part of the userspace-cdemu
 vhba-module: suite, a free, GPL CD/DVD-ROM device emulator for linux.
 vhba-module:
-vhba-module: Homepage: http://cdemu.sourceforge.net/pkg_vhba.php
+vhba-module: Homepage: http://cdemu.sourceforge.net/about/vhba/
 vhba-module:
 vhba-module:
diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild
index b96cfbacfd..a3f2501c22 100644
--- a/system/vhba-module/vhba-module.SlackBuild
+++ b/system/vhba-module/vhba-module.SlackBuild
@@ -23,20 +23,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Revision date: 2012/09/15
-
 PRGNAM=vhba-module
-VERSION=${VERSION:-20120422}
+VERSION=${VERSION:-20140928}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+# Setting ARCH is not supported (and the build crashes if ARCH is exported).
+unset ARCH
+case "$( uname -m )" in
+  i?86) SLKARCH=i486 ;;
+  arm*) SLKARCH=arm ;;
+     *) SLKARCH=$( uname -m ) ;;
+esac
 
 KERNEL=${KERNEL:-$(uname -r)}
 PKGKERNEL=$(echo $KERNEL | tr - _)
@@ -51,18 +49,17 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Use -j1 to avoid problems if larger number of jobs is defined in MAKEFLAGS
-make -j1 KERNELRELEASE=$KERNEL
+make KERNELRELEASE=$KERNEL
 
 mkdir -p $PKG/lib/modules/$KERNEL/extra
 install -m 0644 vhba.ko $PKG/lib/modules/$KERNEL/extra/
@@ -78,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$SLKARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/vhba-module/vhba-module.info b/system/vhba-module/vhba-module.info
index 26f2e056ce..3c2b69591a 100644
--- a/system/vhba-module/vhba-module.info
+++ b/system/vhba-module/vhba-module.info
@@ -1,8 +1,8 @@
 PRGNAM="vhba-module"
-VERSION="20120422"
-HOMEPAGE="http://cdemu.sourceforge.net/pkg_vhba.php"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-20120422.tar.bz2"
-MD5SUM="d97372da1d270d1605742b2995fb6678"
+VERSION="20140928"
+HOMEPAGE="http://cdemu.sourceforge.net/about/vhba/"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-20140928.tar.bz2"
+MD5SUM="967007230bb028424216d9b35da422c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/vice/README b/system/vice/README
index 2f731cb82e..d083b9685b 100644
--- a/system/vice/README
+++ b/system/vice/README
@@ -1,2 +1,6 @@
 VICE is the one and only Versatile Commodore Emulator. It provides emulation 
 of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers.
+
+To enable recording of videos you have to build with this an internal
+(static) version of ffmpeg: enable this passing to the script the parameter
+FFMPEG=yes
diff --git a/system/vice/patches/vice-2.3.21-64bit.patch b/system/vice/patches/vice-2.3.21-64bit.patch
deleted file mode 100644
index b78ea51bc8..0000000000
--- a/system/vice/patches/vice-2.3.21-64bit.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Naur vice-2.3.21.orig/doc/vice.guide vice-2.3.21/doc/vice.guide
---- vice-2.3.21.orig/doc/vice.guide	2012-08-06 00:41:54.000000000 +0200
-+++ vice-2.3.21/doc/vice.guide	2012-08-06 09:44:36.288562655 +0200
-@@ -1292,7 +1292,7 @@
- `Directory' resource, which is a colon (`:')-separated search path
- list, like the UNIX `PATH' environment variable.  The default value is
- 
--     PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
-+     PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
- 
- Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU'
- is the name of the emulated machine (`C64', `C64DTV', `C128', `PET',
-@@ -1306,12 +1306,12 @@
- 
- then the value will be
- 
--     /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
-+     /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
- 
- And system files will be searched for under the following directories,
- in the specified order:
- 
--  1. `/usr/local/lib/VICE/C64'
-+  1. `/usr/local/lib64/VICE/C64'
- 
-   2. `$HOME/.vice/C64'
- 
-@@ -4010,7 +4010,7 @@
-      where:
- 
-         * `LIBDIR' is the VICE installation directory (usually
--          `/usr/local/lib/vice', `/usr/lib/vice' or `/opt/vice/lib');
-+          `/usr/local/lib64/vice', `/usr/lib64/vice' or `/opt/vice/lib');
- 
-         * `EMUID' is the emulation identification string (`C64',
-           `C128', `VIC20' or `PET');
-diff -Naur vice-2.3.21.orig/doc/vice.texi vice-2.3.21/doc/vice.texi
---- vice-2.3.21.orig/doc/vice.texi	2012-07-24 04:08:09.000000000 +0200
-+++ vice-2.3.21/doc/vice.texi	2012-08-06 09:44:36.291562619 +0200
-@@ -1364,7 +1364,7 @@
- default value is
- 
- @example
--PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
-+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
- @end example
- 
- Where @code{PREFIX} is the installation prefix (usually
-@@ -1383,7 +1383,7 @@
- then the value will be
- 
- @example
--/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
-+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
- @end example
- 
- And system files will be searched for under the following directories,
-@@ -1391,7 +1391,7 @@
- 
- @enumerate 1
- @item
--@code{/usr/local/lib/VICE/C64}
-+@code{/usr/local/lib64/VICE/C64}
- @item
- @code{$HOME/.vice/C64}
- @item
-diff -Naur vice-2.3.21.orig/doc/vice.txt vice-2.3.21/doc/vice.txt
---- vice-2.3.21.orig/doc/vice.txt	2012-08-06 02:23:21.000000000 +0200
-+++ vice-2.3.21/doc/vice.txt	2012-08-06 09:44:36.296562563 +0200
-@@ -1056,7 +1056,7 @@
- `Directory' resource, which is a colon (`:')-separated search path
- list, like the UNIX `PATH' environment variable.  The default value is
- 
--PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
-+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
- 
- Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU'
- is the name of the emulated machine (`C64', `C64DTV', `C128', `PET',
-@@ -1070,12 +1070,12 @@
- 
- then the value will be
- 
--/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
-+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
- 
- And system files will be searched for under the following directories,
- in the specified order:
- 
--1. `/usr/local/lib/VICE/C64'
-+1. `/usr/local/lib64/VICE/C64'
- 
- 2. `$HOME/.vice/C64'
- 
-diff -Naur vice-2.3.21.orig/INSTALL vice-2.3.21/INSTALL
---- vice-2.3.21.orig/INSTALL	2011-01-29 14:17:50.000000000 +0100
-+++ vice-2.3.21/INSTALL	2012-08-06 09:44:36.299562529 +0200
-@@ -301,7 +301,7 @@
- 
-       make install
- 
--    The binaries and support files will all go under PREFIX/lib/vice.
-+    The binaries and support files will all go under PREFIX/lib64/vice.
-     You must of course have write permissions for the directories where
-     VICE is to be installed. Normally only the system administrator
-     has write access to /usr/local, the default PREFIX. Either ask
-diff -Naur vice-2.3.21.orig/src/arch/sdl/archdep_unix.h vice-2.3.21/src/arch/sdl/archdep_unix.h
---- vice-2.3.21.orig/src/arch/sdl/archdep_unix.h	2011-07-21 05:10:28.000000000 +0200
-+++ vice-2.3.21/src/arch/sdl/archdep_unix.h	2012-08-06 09:42:11.970323196 +0200
-@@ -88,7 +88,7 @@
- #ifdef __NetBSD__
- #define LIBDIR PREFIX "/share/vice"
- #else
--#define LIBDIR PREFIX "/lib/vice"
-+#define LIBDIR PREFIX "/lib64/vice"
- #endif
- 
- #if defined(__FreeBSD__) || defined(__NetBSD__)
-diff -Naur vice-2.3.21.orig/src/arch/unix/archdep.h vice-2.3.21/src/arch/unix/archdep.h
---- vice-2.3.21.orig/src/arch/unix/archdep.h	2010-10-06 18:17:43.000000000 +0200
-+++ vice-2.3.21/src/arch/unix/archdep.h	2012-08-06 09:42:46.474902531 +0200
-@@ -127,7 +127,7 @@
- #ifdef __NetBSD__
- #define LIBDIR PREFIX "/share/vice"
- #else
--#define LIBDIR PREFIX "/lib/vice"
-+#define LIBDIR PREFIX "/lib64/vice"
- #endif
- 
- #if defined(__FreeBSD__) || defined(__NetBSD__)
diff --git a/system/vice/patches/vice-2.3.21-docs-fixes.patch b/system/vice/patches/vice-2.3.21-docs-fixes.patch
deleted file mode 100644
index 84ed74ca7f..0000000000
--- a/system/vice/patches/vice-2.3.21-docs-fixes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur vice-2.3.21.orig/configure.in vice-2.3.21/configure.in
---- vice-2.3.21.orig/configure.in	2012-08-06 02:23:21.000000000 +0200
-+++ vice-2.3.21/configure.in	2012-08-06 11:35:40.509403194 +0200
-@@ -288,13 +288,7 @@
- 
- AC_CHECK_PROGS(MAKEINFO, makeinfo, no)
- 
--AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no)
--AC_CHECK_PROGS(PDFTEX, pdftex, no)
--if test x"$TEXI2DVI" = "xno" -o x"$PDFTEX" = "xno"; then
--  AM_CONDITIONAL(BUILD_PDF, false)
--else
--  AM_CONDITIONAL(BUILD_PDF, true)
--fi
-+AM_CONDITIONAL(BUILD_PDF, false)
- 
- AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix)
- 
-diff -Naur vice-2.3.21.orig/doc/html/Makefile.am vice-2.3.21/doc/html/Makefile.am
---- vice-2.3.21.orig/doc/html/Makefile.am	2012-06-30 05:31:11.000000000 +0200
-+++ vice-2.3.21/doc/html/Makefile.am	2012-08-06 11:32:11.953905072 +0200
-@@ -45,10 +45,6 @@
- 	vice_14.html \
- 	vice_15.html \
- 	vice_16.html \
--	vice_17.html \
--	vice_18.html \
--	vice_19.html \
--	vice_20.html \
- 	vice_toc.html
- 
- EXTRA_DIST = $(doc_DATA) \
diff --git a/system/vice/patches/vice-2.4.18-64bit.patch b/system/vice/patches/vice-2.4.18-64bit.patch
new file mode 100644
index 0000000000..ee07f3f2b9
--- /dev/null
+++ b/system/vice/patches/vice-2.4.18-64bit.patch
@@ -0,0 +1,84 @@
+diff -Naur vice-2.4.18.orig/doc/vice.guide vice-2.4.18/doc/vice.guide
+--- vice-2.4.18.orig/doc/vice.guide	2015-02-23 19:11:07.000000000 +0100
++++ vice-2.4.18/doc/vice.guide	2015-03-06 17:40:53.822159935 +0100
+@@ -1339,7 +1339,7 @@
+ `Directory' resource, which is a colon (`:')-separated search path
+ list, like the UNIX `PATH' environment variable.  The default value is
+ 
+-     PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
++     PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+ 
+ Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU'
+ is the name of the emulated machine (`C64', `C64DTV', `C128', `PET',
+@@ -1354,12 +1354,12 @@
+ 
+ then the value will be
+ 
+-     /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
++     /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+ 
+ And system files will be searched for under the following directories,
+ in the specified order:
+ 
+-  1. `/usr/local/lib/VICE/C64'
++  1. `/usr/local/lib64/VICE/C64'
+ 
+   2. `$HOME/.vice/C64'
+ 
+diff -Naur vice-2.4.18.orig/doc/vice.texi vice-2.4.18/doc/vice.texi
+--- vice-2.4.18.orig/doc/vice.texi	2015-02-17 20:32:19.000000000 +0100
++++ vice-2.4.18/doc/vice.texi	2015-03-06 17:40:53.829159935 +0100
+@@ -1502,7 +1502,7 @@
+ default value is
+ 
+ @example
+-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+ @end example
+ 
+ Where @code{PREFIX} is the installation prefix (usually
+@@ -1521,7 +1521,7 @@
+ then the value will be
+ 
+ @example
+-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+ @end example
+ 
+ And system files will be searched for under the following directories,
+@@ -1529,7 +1529,7 @@
+ 
+ @enumerate 1
+ @item
+-@code{/usr/local/lib/VICE/C64}
++@code{/usr/local/lib64/VICE/C64}
+ @item
+ @code{$HOME/.vice/C64}
+ @item
+diff -Naur vice-2.4.18.orig/doc/vice.txt vice-2.4.18/doc/vice.txt
+--- vice-2.4.18.orig/doc/vice.txt	2015-02-23 19:11:07.000000000 +0100
++++ vice-2.4.18/doc/vice.txt	2015-03-06 17:40:53.834159935 +0100
+@@ -1094,7 +1094,7 @@
+ `Directory' resource, which is a colon (`:')-separated search path
+ list, like the UNIX `PATH' environment variable.  The default value is
+ 
+-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+ 
+ Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU'
+ is the name of the emulated machine (`C64', `C64DTV', `C128', `PET',
+@@ -1109,12 +1109,12 @@
+ 
+ then the value will be
+ 
+-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+ 
+ And system files will be searched for under the following directories,
+ in the specified order:
+ 
+-1. `/usr/local/lib/VICE/C64'
++1. `/usr/local/lib64/VICE/C64'
+ 
+ 2. `$HOME/.vice/C64'
+ 
diff --git a/system/vice/patches/vice-2.4.4-no-pdf.patch b/system/vice/patches/vice-2.4.4-no-pdf.patch
new file mode 100644
index 0000000000..51e9fd015f
--- /dev/null
+++ b/system/vice/patches/vice-2.4.4-no-pdf.patch
@@ -0,0 +1,16 @@
+diff -Naur vice-2.4.4.orig/configure.proto vice-2.4.4/configure.proto
+--- vice-2.4.4.orig/configure.proto	2013-06-02 02:37:13.000000000 +0200
++++ vice-2.4.4/configure.proto	2013-06-03 11:58:05.355979729 +0200
+@@ -349,11 +349,7 @@
+ 
+ AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no)
+ AC_CHECK_PROGS(PDFTEX, pdftex, no)
+-if test x"$TEXI2DVI" = "xno" -o x"$PDFTEX" = "xno"; then
+-  AM_CONDITIONAL(BUILD_PDF, false)
+-else
+-  AM_CONDITIONAL(BUILD_PDF, true)
+-fi
++AM_CONDITIONAL(BUILD_PDF, false)
+ 
+ AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix)
+ 
diff --git a/system/vice/patches/vice-fix-help.patch b/system/vice/patches/vice-fix-help.patch
index 1312fe8399..e2bfe04f4f 100644
--- a/system/vice/patches/vice-fix-help.patch
+++ b/system/vice/patches/vice-fix-help.patch
@@ -1,21 +1,21 @@
-diff -urpN vice-1.22/man/vice.1 vice-1.22-fixdoc/man/vice.1
---- vice-1.22/man/vice.1	2005-08-21 21:15:04.000000000 +0200
-+++ vice-1.22-fixdoc/man/vice.1	2008-02-16 19:40:11.000000000 +0100
-@@ -40,7 +40,7 @@ a Commodore BASIC de-tokenizer;
+diff -Naur vice-2.4.1.orig/man/vice.1 vice-2.4.1/man/vice.1
+--- vice-2.4.1.orig/man/vice.1	2012-11-29 12:44:39.000000000 +0100
++++ vice-2.4.1/man/vice.1	2013-01-23 19:48:47.065865099 +0100
+@@ -43,7 +43,7 @@
  .PP
  The whole documentation for these programs is available in HTML
  format; the main file should be installed on your system as
--/usr/local/lib/VICE/doc/vice_toc.html.
-+/usr/doc/vice/html/vice_toc.html.
+-/usr/local/lib/vice/doc/vice_toc.html.
++/usr/doc/vice-@VERSION@/html/vice_toc.html.
  .P
  For up to date news about VICE, have a look at the official home page
  at
-diff -urpN vice-1.22/src/arch/unix/gui/uicommands.c vice-1.22-fixdoc/src/arch/unix/gui/uicommands.c
---- vice-1.22/src/arch/unix/gui/uicommands.c	2007-04-01 17:02:44.000000000 +0200
-+++ vice-1.22-fixdoc/src/arch/unix/gui/uicommands.c	2008-02-16 19:31:10.000000000 +0100
-@@ -160,7 +160,7 @@ static UI_CALLBACK(browse_manual)
+diff -Naur vice-2.4.1.orig/src/arch/unix/gui/uicommands.c vice-2.4.1/src/arch/unix/gui/uicommands.c
+--- vice-2.4.1.orig/src/arch/unix/gui/uicommands.c	2012-12-30 15:12:52.000000000 +0100
++++ vice-2.4.1/src/arch/unix/gui/uicommands.c	2013-01-23 19:50:01.276832152 +0100
+@@ -162,7 +162,7 @@
          char *manual_path;
-         manual_path = util_concat(boot_path,"/../doc/vice_toc.html",NULL);
+         manual_path = util_concat(boot_path, "/../doc/vice_toc.html", NULL);
  #else
 -        static const char manual_path[] = DOCDIR "/vice_toc.html";
 +        static const char manual_path[] = DOCDIR "/html/vice_toc.html";
diff --git a/system/vice/slack-desc b/system/vice/slack-desc
index 67c624c9b4..c1c323dda7 100644
--- a/system/vice/slack-desc
+++ b/system/vice/slack-desc
@@ -14,6 +14,6 @@ vice: programs intended for the old 8-bit computers. The current version
 vice: emulates the C64, the C128, the VIC20, almost all PET models, the
 vice: PLUS4 and the CBM-II (aka C610).
 vice:
-vice: Homepage: http://www.viceteam.org/
+vice: Homepage: http://vice-emu.sourceforge.net
 vice:
 vice:
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 4affd7be5c..f57b4594f1 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vice
-VERSION=${VERSION:-2.3.22}
+VERSION=${VERSION:-2.4.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,6 +54,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="static"; else ffmpeg="external"; fi
+
 set -e 
 
 rm -rf $PKG
@@ -73,11 +75,11 @@ find -L . \
 # folder (the folder set up by "make install" is quite broken).
 patch -p1 <$CWD/patches/vice-fix-help.patch
 
-# Small fixes for html doc building, avoid pdf (broken)
-patch -p1 < $CWD/patches/vice-2.3.21-docs-fixes.patch
+# A small fix to avoid avoid building the pdf (broken, we use the one provided)
+patch -p1 < $CWD/patches/vice-2.4.4-no-pdf.patch
 
 # Use /usr/lib64 on 64-bit Slackware
-[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.3.21-64bit.patch
+[ "$ARCH" = "x86_64" ] && patch -p1 < $CWD/patches/vice-2.4.18-64bit.patch
 
 sh autogen.sh || true
 
@@ -89,13 +91,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-gnomeui \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --disable-ffmpeg \
+  --enable-$ffmpeg-ffmpeg \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/system/vice/vice.info b/system/vice/vice.info
index f3889031c4..6914e55707 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,8 +1,8 @@
 PRGNAM="vice"
-VERSION="2.3.22"
-HOMEPAGE="http://www.viceteam.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/vice-2.3.22.tar.xz"
-MD5SUM="44290700d30fca06f8655bab8c2ce86f"
+VERSION="2.4.18"
+HOMEPAGE="http://vice-emu.sourceforge.net"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/vice-2.4.18.tar.xz"
+MD5SUM="4dad01f5600b8eda1b9503a03bccc6e2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/yelp-tools/yelp-tools.SlackBuild b/system/yelp-tools/yelp-tools.SlackBuild
index e65d3133bc..b9f8060dc5 100644
--- a/system/yelp-tools/yelp-tools.SlackBuild
+++ b/system/yelp-tools/yelp-tools.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yelp-tools
-VERSION=${VERSION:-3.12.1}
+VERSION=${VERSION:-3.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +65,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
diff --git a/system/yelp-tools/yelp-tools.info b/system/yelp-tools/yelp-tools.info
index 4163fd6f7f..91db9cdee2 100644
--- a/system/yelp-tools/yelp-tools.info
+++ b/system/yelp-tools/yelp-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="yelp-tools"
-VERSION="3.12.1"
+VERSION="3.16.1"
 HOMEPAGE="http://projects.gnome.org/yelp/"
-DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/yelp-tools/3.12/yelp-tools-3.12.1.tar.xz"
-MD5SUM="a3e16769e0c4e9bf776b3e424b12b1c2"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp-tools/3.16/yelp-tools-3.16.1.tar.xz"
+MD5SUM="2430db2d69241d217fe0af5c1458aa30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yelp-xsl"
diff --git a/system/yelp-xsl/yelp-xsl.SlackBuild b/system/yelp-xsl/yelp-xsl.SlackBuild
index d044b75cac..8d25f99d3e 100644
--- a/system/yelp-xsl/yelp-xsl.SlackBuild
+++ b/system/yelp-xsl/yelp-xsl.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yelp-xsl
-VERSION=${VERSION:-3.12.0}
+VERSION=${VERSION:-3.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +65,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
diff --git a/system/yelp-xsl/yelp-xsl.info b/system/yelp-xsl/yelp-xsl.info
index 3f0c646bf9..e21212b0df 100644
--- a/system/yelp-xsl/yelp-xsl.info
+++ b/system/yelp-xsl/yelp-xsl.info
@@ -1,8 +1,8 @@
 PRGNAM="yelp-xsl"
-VERSION="3.12.0"
+VERSION="3.16.1"
 HOMEPAGE="http://projects.gnome.org/yelp/"
-DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/yelp-xsl/3.12/yelp-xsl-3.12.0.tar.xz"
-MD5SUM="662317dc4f6aeafce0d4ffb2b3766115"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp-xsl/3.16/yelp-xsl-3.16.1.tar.xz"
+MD5SUM="92871729425199f9a4374b8035f60a03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/yelp/yelp.SlackBuild b/system/yelp/yelp.SlackBuild
index fbb7c1a6ad..8c9f8e3708 100644
--- a/system/yelp/yelp.SlackBuild
+++ b/system/yelp/yelp.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yelp
-VERSION=${VERSION:-3.12.0}
+VERSION=${VERSION:-3.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +65,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
diff --git a/system/yelp/yelp.info b/system/yelp/yelp.info
index 4856240915..171212ab1c 100644
--- a/system/yelp/yelp.info
+++ b/system/yelp/yelp.info
@@ -1,8 +1,8 @@
 PRGNAM="yelp"
-VERSION="3.12.0"
+VERSION="3.16.1"
 HOMEPAGE="http://projects.gnome.org/yelp/"
-DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/yelp/3.12/yelp-3.12.0.tar.xz"
-MD5SUM="02f0383b02960766ea46059b9a02cf85"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp/3.16/yelp-3.16.1.tar.xz"
+MD5SUM="528302ce066f3798d40e9c5e2fcedfc4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yelp-tools webkitgtk3"
author	Matteo Bernardini	2015-09-06 11:33:14 +0200
committer	Matteo Bernardini	2015-09-06 11:33:14 +0200
commit	d9304ba8c566df3d4ad187919c353649084cdbc8 (patch)
tree	8867a986555f0476a49fbf7fc094a55d5becd739 /system
parent	277bbd069a9b13040dafc7abf299720a1c6a1a80 (diff)
download	old.slackbuilds-f004527258b7f05ce0a8b8d21f91d03413a39d6c.tar.gz