Minor update.

49 files changed, 266 insertions, 202 deletions

diff --git a/slackware64-current/source/ap/acct/acct.SlackBuild b/slackware64-current/source/ap/acct/acct.SlackBuild
index 43cc97459..3358df4cf 100755
--- a/slackware64-current/source/ap/acct/acct.SlackBuild
+++ b/slackware64-current/source/ap/acct/acct.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2008, 2009, 2010, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2013, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,22 +21,22 @@
 
 
 PKGNAM=acct
-PKGVER=6.5.4
-VERSION=6.5.4
-BUILD=${BUILD:-2}
+PKGVER=6.6.3
+VERSION=6.6.3
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -66,11 +66,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/581421-sa-hz-division.patch.gz | patch -p1 || exit 1
-
 zcat $CWD/acct.logdir.fhs.diff.gz | patch -p1 || exit 1
 # Need this after patching configure.ac:
-autoreconf
+autoreconf -vif
 
 # Configure:
 CFLAGS="$SLKCFLAGS" \
@@ -79,7 +77,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --enable-linux-multiformat \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make || exit 1
@@ -137,7 +135,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS* README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/slackware64-current/source/ap/acct/acct.logdir.fhs.diff.gz b/slackware64-current/source/ap/acct/acct.logdir.fhs.diff.gz
index 595dc815e..e4be22714 100644
--- a/slackware64-current/source/ap/acct/acct.logdir.fhs.diff.gz
+++ b/slackware64-current/source/ap/acct/acct.logdir.fhs.diff.gz
@@ -1 +1 @@
-1fce58493b97270f51bf8c4fa8831df55a6ba34c
+ce795f42e5b44b5deb5bba23ecf3bbe952e4b818
diff --git a/slackware64-current/source/ap/bc/bc.SlackBuild b/slackware64-current/source/ap/bc/bc.SlackBuild
index 796c7c4e8..3bc8cae0b 100755
--- a/slackware64-current/source/ap/bc/bc.SlackBuild
+++ b/slackware64-current/source/ap/bc/bc.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 
 
 PKGNAM=bc
-VERSION=${VERSION:-1.06.95}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-1.07}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -52,8 +52,8 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
-cd ${PKGNAM}-$VERSION
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -69,6 +69,7 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --mandir=/usr/man \
+  --infodir=/usr/info \
   --with-readline \
   --program-prefix= \
   --program-suffix= \
@@ -110,7 +111,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING COPYING.LIB Examples FAQ INSTALL NEWS README Test \
+  AUTHORS* COPYING* Examples FAQ* INSTALL NEWS* README* Test \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/slackware64-current/source/ap/cups-filters/cups-filters.SlackBuild b/slackware64-current/source/ap/cups-filters/cups-filters.SlackBuild
index 170c1997c..43d9a680d 100755
--- a/slackware64-current/source/ap/cups-filters/cups-filters.SlackBuild
+++ b/slackware64-current/source/ap/cups-filters/cups-filters.SlackBuild
@@ -70,7 +70,7 @@ find . \
   -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/slackware64-current/source/ap/cups/cups.SlackBuild b/slackware64-current/source/ap/cups/cups.SlackBuild
index 58b3a2594..acabef7c8 100755
--- a/slackware64-current/source/ap/cups/cups.SlackBuild
+++ b/slackware64-current/source/ap/cups/cups.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2015  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -84,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-pam \
   --disable-avahi \
   --disable-dnssd \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || exit 1
 make BUILDROOT=$PKG install || exit 1
diff --git a/slackware64-current/source/ap/cups/cups.url b/slackware64-current/source/ap/cups/cups.url
index 1eb84ab8f..d3ae484c1 100644
--- a/slackware64-current/source/ap/cups/cups.url
+++ b/slackware64-current/source/ap/cups/cups.url
@@ -1 +1 @@
-https://github.com/apple/cups/releases/download/release-2.1.4/cups-2.1.4-source.tar.gz
+https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz
diff --git a/slackware64-current/source/ap/dc3dd/dc3dd.SlackBuild b/slackware64-current/source/ap/dc3dd/dc3dd.SlackBuild
index 00ffc9f61..ac3bee5eb 100755
--- a/slackware64-current/source/ap/dc3dd/dc3dd.SlackBuild
+++ b/slackware64-current/source/ap/dc3dd/dc3dd.SlackBuild
@@ -69,6 +69,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+chmod +x ./configure
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -76,7 +78,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make -j3 || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -91,7 +93,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS Options_Reference.txt \
+  AUTHORS COPYING* ChangeLog INSTALL NEWS* Options_Reference.txt \
   README* Sample_Commands.txt THANKS THANKS-to-translators TODO \
     $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 644 {} \;
diff --git a/slackware64-current/source/ap/gutenprint/gutenprint.SlackBuild b/slackware64-current/source/ap/gutenprint/gutenprint.SlackBuild
index 271f7bd3a..c77e58b35 100755
--- a/slackware64-current/source/ap/gutenprint/gutenprint.SlackBuild
+++ b/slackware64-current/source/ap/gutenprint/gutenprint.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo gutenprint-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/e/emacs/emacs.SlackBuild b/slackware64-current/source/e/emacs/emacs.SlackBuild
index 095713259..2cf97a117 100755
--- a/slackware64-current/source/e/emacs/emacs.SlackBuild
+++ b/slackware64-current/source/e/emacs/emacs.SlackBuild
@@ -27,7 +27,7 @@
 # Modified by Patrick Volkerding <volkerdi@slackware.com>
 
 PKGNAM=emacs
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 # Determine version number the tarball is labeled with:
 TARBALLVER=${TARBALLVER:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 # OK, now what's being used as the source directory version number...  account
diff --git a/slackware64-current/source/kde/build/calligra b/slackware64-current/source/kde/build/calligra
index 45a4fb75d..ec635144f 100644
--- a/slackware64-current/source/kde/build/calligra
+++ b/slackware64-current/source/kde/build/calligra
@@ -1 +1 @@
-8
+9
diff --git a/slackware64-current/source/kde/build/kopete b/slackware64-current/source/kde/build/kopete
index 0cfbf0888..00750edc0 100644
--- a/slackware64-current/source/kde/build/kopete
+++ b/slackware64-current/source/kde/build/kopete
@@ -1 +1 @@
-2
+3
diff --git a/slackware64-current/source/kde/build/krdc b/slackware64-current/source/kde/build/krdc
index 0cfbf0888..00750edc0 100644
--- a/slackware64-current/source/kde/build/krdc
+++ b/slackware64-current/source/kde/build/krdc
@@ -1 +1 @@
-2
+3
diff --git a/slackware64-current/source/kde/build/libkdcraw b/slackware64-current/source/kde/build/libkdcraw
index 00750edc0..b8626c4cf 100644
--- a/slackware64-current/source/kde/build/libkdcraw
+++ b/slackware64-current/source/kde/build/libkdcraw
@@ -1 +1 @@
-3
+4
diff --git a/slackware64-current/source/kde/patch/kdelibs.patch b/slackware64-current/source/kde/patch/kdelibs.patch
index 8d3c4b5b5..c314b559c 100644
--- a/slackware64-current/source/kde/patch/kdelibs.patch
+++ b/slackware64-current/source/kde/patch/kdelibs.patch
@@ -6,9 +6,6 @@ zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touc
 # export SOLID_UPNP=1
 zcat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
-# Add support for hunspell-1.6.x:
-zcat $CWD/patch/kdelibs/findhunspell.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
 # Revert 3 patches which (although they probably follow the FDo spec better),
 # cause incorrect icon overrides:
 zcat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/slackware64-current/source/l/LibRaw/LibRaw.SlackBuild b/slackware64-current/source/l/LibRaw/LibRaw.SlackBuild
index 35498aa27..44f586d1d 100755
--- a/slackware64-current/source/l/LibRaw/LibRaw.SlackBuild
+++ b/slackware64-current/source/l/LibRaw/LibRaw.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=LibRaw
-VERSION=${VERSION:-0.17.2}
+VERSION=${VERSION:-0.18.2}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -108,13 +108,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-pdftotext LICENSE.LibRaw.pdf
 cp -a \
-  COPYRIGHT Changelog.txt LICENSE.* README* doc \
+  COPYRIGHT Changelog.txt LICENSE* README* doc \
   $PKG/usr/doc/$PKGNAM-$VERSION
-if [ -r $PKG/usr/doc/$PKGNAM-$VERSION/LICENSE.LibRaw.txt ]; then # package weight loss program
-  rm -f $PKG/usr/doc/$PKGNAM-$VERSION/LICENSE.LibRaw.pdf
-fi
 mv $PKG/usr/doc/$PKGNAM-$VERSION/doc $PKG/usr/doc/$PKGNAM-$VERSION/html
 find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \;
 
diff --git a/slackware64-current/source/l/babl/babl.SlackBuild b/slackware64-current/source/l/babl/babl.SlackBuild
index 9bf937bbe..f6e4aabfb 100755
--- a/slackware64-current/source/l/babl/babl.SlackBuild
+++ b/slackware64-current/source/l/babl/babl.SlackBuild
@@ -75,7 +75,7 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/babl-$VERSION \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
   # Trust defaults:
   #--enable-mmx \
   #--disable-sse \
diff --git a/slackware64-current/source/l/enchant/enchant.SlackBuild b/slackware64-current/source/l/enchant/enchant.SlackBuild
index f64adcbb9..8e8f28dc2 100755
--- a/slackware64-current/source/l/enchant/enchant.SlackBuild
+++ b/slackware64-current/source/l/enchant/enchant.SlackBuild
@@ -25,7 +25,7 @@
 
 PKGNAM=enchant
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j6 "}
 
@@ -80,7 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-aspell-prefix=/usr \
   --enable-static=no \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/l/enchant/slack-desc b/slackware64-current/source/l/enchant/slack-desc
index e973fcb44..c422ebf5f 100644
--- a/slackware64-current/source/l/enchant/slack-desc
+++ b/slackware64-current/source/l/enchant/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-       |---handy-ruler------------------------------------------------------|
+       |-----handy-ruler------------------------------------------------------|
 enchant: Enchant (a wrapper for spellcheck libraries)
 enchant:
 enchant: Enchant supports:
diff --git a/slackware64-current/source/l/ffmpeg/ffmpeg.SlackBuild b/slackware64-current/source/l/ffmpeg/ffmpeg.SlackBuild
index e8af4153e..577b40542 100755
--- a/slackware64-current/source/l/ffmpeg/ffmpeg.SlackBuild
+++ b/slackware64-current/source/l/ffmpeg/ffmpeg.SlackBuild
@@ -28,7 +28,7 @@
 
 PKGNAM=ffmpeg
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -83,7 +83,6 @@ librtmp=""    ; [ "${RTMP:-no}" != "no" ]         && librtmp="--enable-librtmp"
 dirac_fast="" ; [ "${SCHROEDINGER:-no}" != "no" ] && dirac_fast="--enable-libschroedinger"
 libspeex=""   ; [ "${SPEEX:-no}" != "no" ]        && libspeex="--enable-libspeex"
 libxvid=""    ; [ "${XVID:-no}" != "no" ]         && libxvid="--enable-libxvid"
-libbluray=""  ; [ "${BLURAY:-no}" != "no" ]       && libbluray="--enable-libbluray"
 libass=""     ; [ "${ASS:-no}" != "no" ]          && libass="--enable-libass"
 libopenal=""  ; [ "${OPENAL:-no}" != "no" ]       && libopenal="--enable-openal"
 libiec61883=""; [ "${IEC61883:-no}" != "no" ]     && libiec61883="--enable-libiec61883"
@@ -123,6 +122,7 @@ fontconfig="" ; [ "${FONTCONFIG:-yes}" != "no" ]  && fontconfig="--enable-libfon
 freetype=""   ; [ "${FREETYPE:-yes}" != "no" ]    && freetype="--enable-libfreetype"
 fribidi=""    ; [ "${FRIBIDI:-yes}" != "no" ]     && fribidi="--enable-libfribidi"
 gnutls=""     ; [ "${GNUTLS:-yes}" != "no" ]      && gnutls="--enable-gnutls"
+libbluray=""  ; [ "${BLURAY:-yes}" != "no" ]      && libbluray="--enable-libbluray"
 libcaca=""    ; [ "${CACA:-yes}" != "no" ]        && libcaca="--enable-libcaca"
 libcdio=""    ; [ "${LIBCDIO:-yes}" != "no" ]     && libcdio="--enable-libcdio"
 libssh=""     ; [ "${LIBSSH:-yes}" != "no" ]      && libssh="--enable-libssh"
diff --git a/slackware64-current/source/l/gegl/gegl.SlackBuild b/slackware64-current/source/l/gegl/gegl.SlackBuild
index 72a47349d..c305958b7 100755
--- a/slackware64-current/source/l/gegl/gegl.SlackBuild
+++ b/slackware64-current/source/l/gegl/gegl.SlackBuild
@@ -23,12 +23,12 @@
 
 
 VERSION=${VERSION:-$(echo gegl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -41,8 +41,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-gegl
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
diff --git a/slackware64-current/source/l/giflib/giflib.SlackBuild b/slackware64-current/source/l/giflib/giflib.SlackBuild
index 80196ed3f..90b7444fb 100755
--- a/slackware64-current/source/l/giflib/giflib.SlackBuild
+++ b/slackware64-current/source/l/giflib/giflib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2015  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2015, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,15 +28,15 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -73,7 +73,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-x=no \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/l/gvfs/gvfs.SlackBuild b/slackware64-current/source/l/gvfs/gvfs.SlackBuild
index 5006eca3f..a066936df 100755
--- a/slackware64-current/source/l/gvfs/gvfs.SlackBuild
+++ b/slackware64-current/source/l/gvfs/gvfs.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=gvfs
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:--j6}
 
diff --git a/slackware64-current/source/l/imagemagick/doinst.sh.gz b/slackware64-current/source/l/imagemagick/doinst.sh.gz
new file mode 100644
index 000000000..1758d7850
--- /dev/null
+++ b/slackware64-current/source/l/imagemagick/doinst.sh.gz
@@ -0,0 +1 @@
+ca291c1061e3bf2ffdcb49912fadbd89fd0785e9
diff --git a/slackware64-current/source/l/imagemagick/slack-desc b/slackware64-current/source/l/imagemagick/slack-desc
new file mode 100644
index 000000000..80ac9a678
--- /dev/null
+++ b/slackware64-current/source/l/imagemagick/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+imagemagick: imagemagick (a robust collection of image processing tools)
+imagemagick:
+imagemagick: ImageMagick is a collection of tools for manipulating and displaying
+imagemagick: digital images.  It can merge images, transform image dimensions,
+imagemagick: do screen captures, create animation sequences, and convert between
+imagemagick: many different image formats.  
+imagemagick:
+imagemagick: ImageMagick was written by John Cristy of ImageMagick Studio.
+imagemagick:
+imagemagick: Home page:  http://www.imagemagick.org/
+imagemagick:
diff --git a/slackware64-current/source/l/jasper/jasper.SlackBuild b/slackware64-current/source/l/jasper/jasper.SlackBuild
index 8115b29c0..3e7e26dcb 100755
--- a/slackware64-current/source/l/jasper/jasper.SlackBuild
+++ b/slackware64-current/source/l/jasper/jasper.SlackBuild
@@ -25,7 +25,7 @@
 
 PKGNAM=jasper
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -37,26 +37,19 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-case "$ARCH" in
-  i586)      SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-             LIBDIRSUFFIX=""
-             ;;
-  s390)      SLKCFLAGS="-O2"
-             LIBDIRSUFFIX=""
-             ;;
-  powerpc)   SLKCFLAGS="-O2"
-             LIBDIRSUFFIX=""
-             ;;
-  x86_64)    SLKCFLAGS="-O2 -fPIC"
-             LIBDIRSUFFIX="64"
-             ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
-             LIBDIRSUFFIX=""
-             ;;
-  *)         SLKCFLAGS="-O2"
-             LIBDIRSUFFIX=""
-             ;;
-esac
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -67,7 +60,7 @@ mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -75,51 +68,28 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786
-zcat $CWD/patches/jpc_dec.c.patch.gz | patch -p1 --verbose || exit 1
-
-# Taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
-zcat $CWD/patches/patch-libjasper-stepsizes-overflow.diff.gz | patch -p1 --verbose || exit 1
-
-# Apply security fixes - taken from fedora
-zcat $CWD/patches/jasper-1.900.1-CVE-2008-3520.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-1.900.1-CVE-2008-3522.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-1.900.1-CVE-2011-4516-CVE-2011-4517-CERT-VU-887409.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-CVE-2014-8138.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-CVE-2014-8157.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-CVE-2014-8158.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-CVE-2014-8137.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-CVE-2014-9029.patch.gz | patch -p1 --verbose || exit 1
-
-# Apply fixes for issues discovered by coverity - taken from fedora
-zcat $CWD/patches/jasper-1.900.1-Coverity-BAD_SIZEOF.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-1.900.1-Coverity-CHECKED_RETURN.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-1.900.1-Coverity-FORWARD_NULL.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-1.900.1-Coverity-NULL_RETURNS.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-1.900.1-Coverity-RESOURCE_LEAKS.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-1.900.1-Coverity-UNREACHABLE.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jasper-1.900.1-Coverity-UNUSED_VALUE.patch.gz | patch -p1 --verbose || exit 1
-
-CFLAGS="$SLKCFLAGS -fno-strict-overflow" \
-CXXFLAGS="$SLKCFLAGS -fno-strict-overflow" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --enable-shared \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-
-make || exit 1
-make DESTDIR=$PKG install
-
+# Building docs needs texlive, and no easy way to disable it via cmake
+sed -i "/add_subdirectory(doc)/d" CMakeLists.txt
+
+# Build and install:
+mkdir builder
+cd builder
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PKGNAM-$VERSION \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DLATEX_FOUND=NO \
+    .. || exit 1
+  make $NUMJOBS VERBOSE=1 || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd -
+  
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  COPYRIGHT INSTALL LICENSE NEWS README \
+  COPYRIGHT INSTALL LICENSE README* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
diff --git a/slackware64-current/source/l/jasper/slack-desc b/slackware64-current/source/l/jasper/slack-desc
index c79751af3..63d48b108 100644
--- a/slackware64-current/source/l/jasper/slack-desc
+++ b/slackware64-current/source/l/jasper/slack-desc
@@ -12,7 +12,7 @@ jasper: The JasPer Project is an open-source initiative to provide a free
 jasper: software-based reference implementation of the codec specified in the
 jasper: JPEG-2000 Part-1 standard (i.e., ISO/IEC 15444-1).jasper:
 jasper:
-jasper: jasper home: http://www.ece.uvic.ca/~mdadams/jasper/
+jasper: JasPer home: http://www.ece.uvic.ca/~mdadams/jasper/
 jasper:
 jasper:
 jasper:
diff --git a/slackware64-current/source/l/libdiscid/libdiscid.SlackBuild b/slackware64-current/source/l/libdiscid/libdiscid.SlackBuild
index 52e8310b5..475c55486 100755
--- a/slackware64-current/source/l/libdiscid/libdiscid.SlackBuild
+++ b/slackware64-current/source/l/libdiscid/libdiscid.SlackBuild
@@ -23,7 +23,7 @@
 
 
 PKGNAM=libdiscid
-VERSION=${VERSION:-0.6.1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 CWD=$(pwd)
@@ -35,15 +35,15 @@ mkdir -p $TMP $PKG
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -77,7 +77,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
+    .. || exit 1
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 cd -
diff --git a/slackware64-current/source/l/libmtp/libmtp.SlackBuild b/slackware64-current/source/l/libmtp/libmtp.SlackBuild
index 6bf90b462..b0d941419 100755
--- a/slackware64-current/source/l/libmtp/libmtp.SlackBuild
+++ b/slackware64-current/source/l/libmtp/libmtp.SlackBuild
@@ -85,16 +85,6 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Guess someone didn't have enough to drink:
-( cd $PKG/usr/bin
-  rm -f mtp-sendtr mtp-sendfile mtp-newfolder mtp-getfile mtp-delfile
-  ln -s mtp-connect mtp-sendtr
-  ln -s mtp-connect mtp-sendfile
-  ln -s mtp-connect mtp-newfolder
-  ln -s mtp-connect mtp-getfile
-  ln -s mtp-connect mtp-delfile
-)
-
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/slackware64-current/source/l/libraw1394/libraw1394.SlackBuild b/slackware64-current/source/l/libraw1394/libraw1394.SlackBuild
index 47f684d19..2787ae26d 100755
--- a/slackware64-current/source/l/libraw1394/libraw1394.SlackBuild
+++ b/slackware64-current/source/l/libraw1394/libraw1394.SlackBuild
@@ -78,7 +78,7 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/l/libsamplerate/libsamplerate.SlackBuild b/slackware64-current/source/l/libsamplerate/libsamplerate.SlackBuild
index 2c05e694e..66c00e168 100755
--- a/slackware64-current/source/l/libsamplerate/libsamplerate.SlackBuild
+++ b/slackware64-current/source/l/libsamplerate/libsamplerate.SlackBuild
@@ -5,13 +5,13 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PKGNAM=libsamplerate
-VERSION=0.1.8
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -23,8 +23,8 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -46,15 +46,18 @@ cd $PKGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+sed -i "s|\$prefix/share/doc/libsamplerate0-dev/html|\$htmldir|g" configure
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
+  --htmldir=/usr/doc/$PKGNAM-$VERSION/html \
   --disable-static \
   --localstatedir=/var \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make -j4 || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -63,7 +66,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS COPYING* NEWS README* doc/* $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS COPYING* NEWS README* $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/slackware64-current/source/l/libsndfile/libsndfile.SlackBuild b/slackware64-current/source/l/libsndfile/libsndfile.SlackBuild
index 3c0c42bbf..aaf88664e 100755
--- a/slackware64-current/source/l/libsndfile/libsndfile.SlackBuild
+++ b/slackware64-current/source/l/libsndfile/libsndfile.SlackBuild
@@ -75,7 +75,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --htmldir=/usr/doc/$PKGNAM-$VERSION/html \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make htmldocdir=/usr/doc/$PKGNAM-$VERSION/html || exit 1
 make htmldocdir=/usr/doc/$PKGNAM-$VERSION/html DESTDIR=$PKG install
diff --git a/slackware64-current/source/l/libspectre/libspectre.SlackBuild b/slackware64-current/source/l/libspectre/libspectre.SlackBuild
index 70ae971bf..d60df7ecd 100755
--- a/slackware64-current/source/l/libspectre/libspectre.SlackBuild
+++ b/slackware64-current/source/l/libspectre/libspectre.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@ BUILD=${BUILD:-1}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -41,8 +41,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,6 +69,7 @@ find . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
+CPPFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -77,7 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/l/libtiff/libtiff.SlackBuild b/slackware64-current/source/l/libtiff/libtiff.SlackBuild
index 99f8eb324..82f6e2310 100755
--- a/slackware64-current/source/l/libtiff/libtiff.SlackBuild
+++ b/slackware64-current/source/l/libtiff/libtiff.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-$(echo tiff-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=1
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -64,7 +64,6 @@ tar xvf $CWD/tiff-$VERSION.tar.?z* || exit 1
 cd tiff-$VERSION
 
 zcat $CWD/libtiff-am-version.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/libtiff-make-check.patch.gz | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
diff --git a/slackware64-current/source/l/libvncserver/libvncserver.SlackBuild b/slackware64-current/source/l/libvncserver/libvncserver.SlackBuild
index 1e22af589..2377ae07a 100755
--- a/slackware64-current/source/l/libvncserver/libvncserver.SlackBuild
+++ b/slackware64-current/source/l/libvncserver/libvncserver.SlackBuild
@@ -25,7 +25,7 @@
 # Modified by Eric Hameleers <alien at slackware.com>
 
 VERSION=${VERSION:-$(echo LibVNCServer-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
 
@@ -82,8 +82,6 @@ find . \
 
 ./autogen.sh
 
-# libva support broken and WONTFIX (for now) upstream.
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -92,9 +90,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --without-libva \
   --disable-static \
-  --build=$TARGET
+  --build=$TARGET || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -108,7 +105,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/libvncserver-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS* README* TODO* \
   $PKG/usr/doc/libvncserver-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/slackware64-current/source/l/poppler/poppler.SlackBuild b/slackware64-current/source/l/poppler/poppler.SlackBuild
index 05a33c17c..ed92d6104 100755
--- a/slackware64-current/source/l/poppler/poppler.SlackBuild
+++ b/slackware64-current/source/l/poppler/poppler.SlackBuild
@@ -70,6 +70,7 @@ find . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/slackware64-current/source/l/virtuoso-ose/virtuoso-ose.SlackBuild b/slackware64-current/source/l/virtuoso-ose/virtuoso-ose.SlackBuild
index 222e0ca8d..0a14e9dd1 100755
--- a/slackware64-current/source/l/virtuoso-ose/virtuoso-ose.SlackBuild
+++ b/slackware64-current/source/l/virtuoso-ose/virtuoso-ose.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=virtuoso-opensource
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/n/openvpn/openvpn.SlackBuild b/slackware64-current/source/n/openvpn/openvpn.SlackBuild
index 920834812..b1be86bb2 100755
--- a/slackware64-current/source/n/openvpn/openvpn.SlackBuild
+++ b/slackware64-current/source/n/openvpn/openvpn.SlackBuild
@@ -85,7 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-lzo \
   --enable-iproute2 \
   --disable-plugin-auth-pam \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/x/libdrm/libdrm.SlackBuild b/slackware64-current/source/x/libdrm/libdrm.SlackBuild
index bcd40699a..c08d9e2f8 100755
--- a/slackware64-current/source/x/libdrm/libdrm.SlackBuild
+++ b/slackware64-current/source/x/libdrm/libdrm.SlackBuild
@@ -78,7 +78,7 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --enable-udev \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/slackware64-current/source/x/libinput/libinput.SlackBuild b/slackware64-current/source/x/libinput/libinput.SlackBuild
index 7fe678194..a03ba2790 100755
--- a/slackware64-current/source/x/libinput/libinput.SlackBuild
+++ b/slackware64-current/source/x/libinput/libinput.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=libinput
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/slackware64-current/source/x/mesa/mesa.SlackBuild b/slackware64-current/source/x/mesa/mesa.SlackBuild
index 667a1939b..3fec33b94 100755
--- a/slackware64-current/source/x/mesa/mesa.SlackBuild
+++ b/slackware64-current/source/x/mesa/mesa.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=mesa
-VERSION=${VERSION:-17.0.2}
+VERSION=${VERSION:-17.0.3}
 DEMOVERS=${DEMOVERS:-8.3.0}
 BUILD=${BUILD:-1}
 
diff --git a/slackware64-current/source/xap/MPlayer/MPlayer.SlackBuild b/slackware64-current/source/xap/MPlayer/MPlayer.SlackBuild
index 769350ccd..c517e4197 100755
--- a/slackware64-current/source/xap/MPlayer/MPlayer.SlackBuild
+++ b/slackware64-current/source/xap/MPlayer/MPlayer.SlackBuild
@@ -102,7 +102,7 @@
 PRGNAM=MPlayer
 VERSION=${VERSION:-20170208}
 BRANCH=${BRANCH:-1.3}        # leave empty if you want to build MPlayer trunk
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/xap/gimp/gimp.SlackBuild b/slackware64-current/source/xap/gimp/gimp.SlackBuild
index c86a853a2..6118d55c9 100755
--- a/slackware64-current/source/xap/gimp/gimp.SlackBuild
+++ b/slackware64-current/source/xap/gimp/gimp.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=gimp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz b/slackware64-current/source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz
new file mode 100644
index 000000000..9548f4d68
--- /dev/null
+++ b/slackware64-current/source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz
@@ -0,0 +1 @@
+38496c1606988a85198d4d6329fbb0d34b1194bf
diff --git a/slackware64-current/source/xap/mozilla-thunderbird/autoconf/autoconf.build b/slackware64-current/source/xap/mozilla-thunderbird/autoconf/autoconf.build
new file mode 100755
index 000000000..7dae1bad1
--- /dev/null
+++ b/slackware64-current/source/xap/mozilla-thunderbird/autoconf/autoconf.build
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Copyright 2005-2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=autoconf
+VERSION=2.13
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-autoconf
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf autoconf-$VERSION
+tar xvf $CWD/autoconf-$VERSION.tar.xz || exit 1
+cd autoconf-$VERSION
+
+zcat $CWD/autoconf-2.13-consolidated_fixes-1.patch.gz | patch -p1 --verbose || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Build a temporary copy of autoconf-2.13 only to be used to compile
+# Firefox, since it somewhat inexplicably requires this ancient version:
+
+rm -rf $TMP/autoconf-tmp
+mkdir -p $TMP/autoconf-tmp
+# This will be at the beginning of the $PATH, so protect against nonsense
+# happening in /tmp:
+chmod 700 $TMP/autoconf-tmp
+rm -rf $TMP/autoconf-tmp/*
+mkdir -p $TMP/autoconf-tmp/usr
+
+./configure \
+  --prefix=$TMP/autoconf-tmp/usr \
+  --program-suffix=-2.13 \
+  --infodir=$TMP/autoconf-tmp/usr/info \
+  --mandir=$TMP/autoconf-tmp/usr/man \
+  --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || make || exit 1
+make install || exit 1
+
diff --git a/slackware64-current/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/slackware64-current/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 7baf5f330..5cdc04d2b 100755
--- a/slackware64-current/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/slackware64-current/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 
 VERSION=$(basename $(ls thunderbird-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
 RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b)
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Specify this variable for a localized build.
 # For example, to build a version of Thunderbird with Italian support, run
@@ -49,20 +49,29 @@ if [ -z "$ARCH" ]; then
 fi
 
 if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS=""
   LIBDIRSUFFIX=""
   OPTIMIZE=" --enable-optimize=-O2 "
-  # On IA32, use gold since GNU ld runs out of memory linking libxul.so:
-  PATH="$(pwd)/gold:$PATH"
-  export CC="gcc -B$(pwd)/gold"
-  export CXX="g++ -B$(pwd)/gold"
 elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-fPIC"
   LIBDIRSUFFIX="64"
   OPTIMIZE=" --enable-optimize=-O2 "
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-march=armv4 -mtune=xscale"
+  LIBDIRSUFFIX=""
+  OPTIMIZE=" --enable-optimize=-O2 "
 else
+  SLKCFLAGS=""
   LIBDIRSUFFIX=""
   OPTIMIZE=" --enable-optimize=-O2 "
 fi
 
+# Link using gold.  This avoids running out of memory on 32-bit systems, and
+# avoids a recurring build failure with GNU ld on other systems.
+PATH="$(pwd)/gold:$PATH"
+export CC="gcc -B$(pwd)/gold"
+export CXX="g++ -B$(pwd)/gold"
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mozilla-thunderbird
@@ -72,6 +81,10 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}
 
+# We need to use the incredibly ancient autoconf-2.13 for this  :/
+( cd $CWD/autoconf ; ./autoconf.build )
+PATH=/tmp/autoconf-tmp/usr/bin:$PATH
+
 cd $TMP
 rm -rf thunderbird-$VERSION
 # Unpack this in a subdirectory to prevent changing permissions on /tmp:
@@ -115,31 +128,23 @@ OPTIONS="\
   --enable-official-branding \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/thunderbird-$VERSION \
+  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/thunderbird-$RELEASEVER \
   --with-system-zlib \
   --enable-alsa \
   --enable-application=mail \
   --enable-calendar \
   --enable-default-toolkit=cairo-gtk2 \
   --enable-startup-notification \
-  --enable-crypto \
   --enable-ldap \
-  --enable-libxul \
-  --enable-svg \
-  --enable-canvas \
-  --enable-xft \
   $OPTIMIZE \
-  --enable-reorder \
   --enable-strip \
   --enable-cpp-rtti \
   --disable-accessibility \
   --disable-crashreporter \
   --disable-debug \
   --disable-tests \
-  --disable-pedantic \
   --host=$ARCH-slackware-linux \
-  --target=$ARCH-slackware-linux \
-  --build=$ARCH-slackware-linux"
+  --target=$ARCH-slackware-linux"
   # Complains about missing APNG support in Slackware's libpng:
   #--with-system-png \
   # Broken with 12.0:
@@ -158,6 +163,8 @@ fi
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 export MOZ_PHOENIX=1
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
 export MOZ_MAKE_FLAGS="$NUMJOBS"
 
 # Clear some variables that could break the build
diff --git a/slackware64-current/source/xap/xine-lib/slack-desc b/slackware64-current/source/xap/xine-lib/slack-desc
index b94a4251e..276736680 100644
--- a/slackware64-current/source/xap/xine-lib/slack-desc
+++ b/slackware64-current/source/xap/xine-lib/slack-desc
@@ -14,6 +14,6 @@ xine-lib: other media players and multimedia applications) for smooth video
 xine-lib: processing and playback of multimedia streams such as movies, radio
 xine-lib: and TV network streams, DVDs, and VCDs.
 xine-lib:
-xine-lib: New releases:  https://xine-lib.alioth.debian.org/releases
+xine-lib:
 xine-lib:
 xine-lib:
diff --git a/slackware64-current/source/xap/xine-lib/xine-lib.SlackBuild b/slackware64-current/source/xap/xine-lib/xine-lib.SlackBuild
index 214beb6e3..7846ce8e0 100755
--- a/slackware64-current/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/slackware64-current/source/xap/xine-lib/xine-lib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2008, 2009, 2012, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
-# Copyright 2015  Heinz Wiesinger, Amsterdam, NL
+# Copyright 2017  Heinz Wiesinger, Amsterdam, NL
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,13 @@
 
 
 # Version on the tarball
-VERSION=1.2.6
+VERSION=1.2.8
 # Version used in the source directory to cd into
-DIRVER=1.2.6
+DIRVER=1.2.8
 # Version used for the Slackware package
-PKGVER=1.2.6
+PKGVER=1.2.8
 
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -69,17 +69,17 @@ rm -rf xine-lib-$VERSION
 tar xvf $CWD/xine-lib-$VERSION.tar.xz || exit 1
 cd xine-lib-$DIRVER || exit 1
 
-# Fix source for ffmpeg-3.2.x:
-sed -e 's/avcodec_alloc_frame/av_frame_alloc/'        \
-    -e 's/avcodec_free_frame/av_frame_free/'          \
-    -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
-       src/dxr3/ffmpeg_encoder.c &&
-#sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
-#    -i src/video_dec/image.c &&
-sed -e '/xineplug_vo_out_xcbxv_la_LIBADD/s/$(XCB_LIBS)/$(XCBSHM_LIBS) $(XCB_LIBS)/' \
-    -i src/video_out/Makefile.in &&
-sed -e 's/\(xcb-shape >= 1.0\)/xcb \1/' \
-    -i m4/video_out.m4 &&
+# # Fix source for ffmpeg-3.2.x:
+# sed -e 's/avcodec_alloc_frame/av_frame_alloc/'        \
+#     -e 's/avcodec_free_frame/av_frame_free/'          \
+#     -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
+#        src/dxr3/ffmpeg_encoder.c &&
+# #sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
+# #    -i src/video_dec/image.c &&
+# sed -e '/xineplug_vo_out_xcbxv_la_LIBADD/s/$(XCB_LIBS)/$(XCBSHM_LIBS) $(XCB_LIBS)/' \
+#     -i src/video_out/Makefile.in &&
+# sed -e 's/\(xcb-shape >= 1.0\)/xcb \1/' \
+#     -i m4/video_out.m4 &&
 
 chown -R root:root .
 find . \
diff --git a/slackware64-current/source/xap/xv/xv.SlackBuild b/slackware64-current/source/xap/xv/xv.SlackBuild
index 9b5b4cd31..aac3f9568 100755
--- a/slackware64-current/source/xap/xv/xv.SlackBuild
+++ b/slackware64-current/source/xap/xv/xv.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2015, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,12 +21,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.10a
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-8}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
diff --git a/slackware64-current/source/xfce/tumbler/tumbler.SlackBuild b/slackware64-current/source/xfce/tumbler/tumbler.SlackBuild
index 365697d91..e557adf85 100755
--- a/slackware64-current/source/xfce/tumbler/tumbler.SlackBuild
+++ b/slackware64-current/source/xfce/tumbler/tumbler.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=tumbler
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )