From 19ab58f8d4948b29929b8762726842399cce4d42 Mon Sep 17 00:00:00 2001
From: Adrien Nader <adrien@notk.org>
Date: Thu, 12 Jan 2017 07:40:09 +0100
Subject: Minor update.

---
 .../source/a/aaa_elflibs/aaa_elflibs.SlackBuild    |  2 +-
 slackware64-current/source/a/bash/bash.SlackBuild  |  2 +-
 .../source/a/elvis/elvis.SlackBuild                |  4 +-
 slackware64-current/source/a/file/file.SlackBuild  |  2 +-
 slackware64-current/source/a/gawk/gawk.SlackBuild  |  2 +-
 .../source/a/gettext/gettext-tools.SlackBuild      |  2 +-
 .../source/a/gettext/gettext.SlackBuild            |  2 +-
 .../source/a/getty-ps/getty-ps.SlackBuild          |  4 +-
 slackware64-current/source/a/gpm/gpm.SlackBuild    | 10 ++---
 slackware64-current/source/a/gpm/slack-desc        |  6 +--
 .../source/a/gptfdisk/gptfdisk.SlackBuild          |  8 ++--
 slackware64-current/source/a/grub/grub.SlackBuild  | 16 +++-----
 .../grub/grub.dejavusansmono.gfxterm.font.diff.gz  |  2 +-
 .../source/a/hwdata/hwdata.SlackBuild              |  4 ++
 slackware64-current/source/a/less/less.SlackBuild  |  2 +-
 .../source/a/minicom/minicom.SlackBuild            | 12 +++---
 slackware64-current/source/a/minicom/slack-desc    |  2 +-
 .../source/a/procps-ng/procps-ng.SlackBuild        |  2 +-
 slackware64-current/source/a/sed/sed.SlackBuild    | 17 ++++-----
 slackware64-current/source/a/splitvt/slack-desc    |  2 +-
 .../source/a/splitvt/splitvt.SlackBuild            | 13 +++----
 .../source/a/util-linux/util-linux.SlackBuild      | 10 +----
 .../source/a/xfsprogs/xfsprogs.SlackBuild          | 21 +++++------
 slackware64-current/source/a/xz/xz.SlackBuild      |  8 ++--
 slackware64-current/source/ap/bc/bc.SlackBuild     | 10 ++---
 slackware64-current/source/ap/bpe/bpe.SlackBuild   | 14 +++----
 .../source/ap/ghostscript/ghostscript.SlackBuild   |  9 ++++-
 .../source/ap/gphoto2/gphoto2.SlackBuild           |  2 +-
 .../source/ap/gutenprint/gutenprint.SlackBuild     |  6 +--
 .../source/ap/ispell/ispell.SlackBuild             | 15 ++++----
 slackware64-current/source/ap/joe/joe.SlackBuild   |  4 +-
 slackware64-current/source/ap/jove/jove.SlackBuild | 10 ++---
 .../source/ap/mariadb/mariadb.SlackBuild           |  2 +-
 slackware64-current/source/ap/mc/mc.SlackBuild     |  4 +-
 slackware64-current/source/ap/moc/moc.SlackBuild   |  2 +-
 .../source/ap/pamixer/pamixer.SlackBuild           |  2 +-
 .../source/ap/powertop/powertop.SlackBuild         |  2 +-
 slackware64-current/source/ap/sc/sc.SlackBuild     |  3 +-
 .../source/ap/screen/screen.SlackBuild             |  2 +-
 .../source/ap/texinfo/texinfo.SlackBuild           |  2 +-
 .../source/ap/xfsdump/xfsdump.SlackBuild           |  2 +-
 .../source/d/clisp/clisp.SlackBuild                | 34 ++++++++++++-----
 slackware64-current/source/d/clisp/source.download |  8 ++++
 .../source/d/cscope/cscope.SlackBuild              |  2 +-
 slackware64-current/source/d/flex/flex.SlackBuild  |  2 +-
 slackware64-current/source/d/gdb/gdb.SlackBuild    |  2 +-
 .../source/d/gnu-cobol/gnu-cobol.SlackBuild        | 12 ++----
 slackware64-current/source/d/gnu-cobol/slack-desc  |  2 +-
 .../source/d/gperf/gperf.SlackBuild                |  8 ++--
 .../source/d/guile/guile.SlackBuild                |  2 +-
 slackware64-current/source/d/m4/m4.SlackBuild      |  4 +-
 slackware64-current/source/d/make/make.SlackBuild  |  2 +-
 slackware64-current/source/d/perl/perl.SlackBuild  | 14 ++-----
 slackware64-current/source/d/ruby/ruby.SlackBuild  |  4 +-
 .../source/d/subversion/subversion.SlackBuild      |  2 +-
 .../source/e/emacs/emacs.SlackBuild                |  2 +-
 slackware64-current/source/kde/build/analitza      |  2 +-
 slackware64-current/source/kde/build/calligra      |  2 +-
 slackware64-current/source/kde/build/kig           |  2 +-
 slackware64-current/source/kde/build/korundum      |  2 +-
 slackware64-current/source/kde/build/lokalize      |  2 +-
 slackware64-current/source/kde/build/perlkde       |  2 +-
 slackware64-current/source/kde/build/perlqt        |  2 +-
 slackware64-current/source/kde/build/qtruby        |  2 +-
 slackware64-current/source/kde/patch/kdelibs.patch |  3 ++
 .../source/l/akonadi/akonadi.SlackBuild            |  2 +-
 .../source/l/aspell/aspell.SlackBuild              |  2 +-
 slackware64-current/source/l/elfutils/slack-desc   |  2 +-
 .../source/l/enchant/enchant.SlackBuild            |  8 ++--
 .../source/l/hunspell/hunspell.SlackBuild          |  8 ++--
 .../source/l/libcaca/libcaca.SlackBuild            | 14 ++++---
 .../source/l/libcap/libcap.SlackBuild              | 10 ++---
 .../source/l/libcdio/libcdio.SlackBuild            |  2 +-
 .../source/l/libgphoto2/libgphoto2.SlackBuild      |  2 +-
 .../source/l/libnjb/libnjb.SlackBuild              | 16 ++++----
 .../source/l/parted/parted.SlackBuild              |  2 +-
 .../source/l/parted/parted.SlackBuild.static       |  2 +-
 .../source/l/pilot-link/pilot-link.SlackBuild      |  2 +-
 .../source/l/taglib/taglib.SlackBuild              |  3 +-
 .../source/l/virtuoso-ose/virtuoso-ose.SlackBuild  |  2 +-
 slackware64-current/source/l/vte/vte.SlackBuild    |  2 +-
 slackware64-current/source/l/zlib/zlib.SlackBuild  | 44 +++++++++-------------
 .../n/NetworkManager/NetworkManager.SlackBuild     |  2 +-
 .../source/n/alpine/alpine.SlackBuild              |  4 +-
 slackware64-current/source/n/bind/bind.SlackBuild  |  2 +-
 slackware64-current/source/n/elm/elm.SlackBuild    |  4 +-
 .../source/n/epic5/epic5.SlackBuild                |  2 +-
 .../source/n/gnupg/gnupg.SlackBuild                |  2 +-
 .../source/n/gnupg2/gnupg2.SlackBuild              |  4 +-
 .../source/n/gnutls/gnutls.SlackBuild              | 14 +++++--
 .../source/n/iftop/iftop.SlackBuild                |  8 ++--
 .../source/n/iptraf-ng/iptraf-ng.SlackBuild        | 10 ++---
 .../source/n/irssi/irssi.SlackBuild                |  4 +-
 slackware64-current/source/n/lftp/slack-desc       |  2 +-
 .../source/n/links/links.SlackBuild                |  2 +-
 slackware64-current/source/n/lynx/lynx.SlackBuild  |  2 +-
 .../source/n/mcabber/mcabber.SlackBuild            |  2 +-
 .../source/n/metamail/metamail.SlackBuild          | 10 ++---
 slackware64-current/source/n/mtr/mtr.SlackBuild    |  2 +-
 .../source/n/ncftp/ncftp.SlackBuild                | 12 +++---
 slackware64-current/source/n/ncftp/slack-desc      |  2 +-
 .../source/n/net-snmp/net-snmp.SlackBuild          |  6 ++-
 slackware64-current/source/n/net-tools/ipmask.8    |  1 -
 .../source/n/netkit-ftp/netkit-ftp.SlackBuild      |  4 +-
 .../source/n/netkit-ntalk/netkit-ntalk.SlackBuild  |  4 +-
 .../source/n/netwatch/netwatch.SlackBuild          |  2 +-
 .../source/n/nftables/nftables.SlackBuild          |  4 +-
 slackware64-current/source/n/nn/nn.SlackBuild      | 25 ++++++------
 .../source/n/nn/nn.badnntphost.diff.gz             |  2 +-
 slackware64-current/source/n/ntp/ntp.SlackBuild    |  2 +-
 .../source/n/obexftp/obexftp.SlackBuild            |  4 +-
 slackware64-current/source/n/php/php.SlackBuild    |  2 +-
 .../source/n/pinentry/pinentry.SlackBuild          |  2 +-
 .../source/n/proftpd/proftpd.SlackBuild            |  2 +-
 .../source/n/snownews/snownews.SlackBuild          |  8 ++--
 .../source/n/telnet/telnet.SlackBuild              |  4 +-
 .../source/n/tftp-hpa/tftp-hpa.SlackBuild          |  4 +-
 slackware64-current/source/n/tin/tin.SlackBuild    |  2 +-
 .../patches/quiet-scan-results-message.diff        | 10 ++---
 .../source/n/ytalk/ytalk.SlackBuild                | 10 ++---
 .../source/x/x11/configure/xf86-video-intel        |  1 +
 .../source/x/xterm/xterm.SlackBuild                |  2 +-
 .../source/xap/MPlayer/MPlayer.SlackBuild          |  4 +-
 slackware64-current/source/xap/ddd/ddd.SlackBuild  | 12 ++----
 .../source/xap/fvwm/fvwm.SlackBuild                |  4 +-
 .../source/xap/gftp/gftp.SlackBuild                | 10 ++---
 .../source/xap/gnuchess/gnuchess.SlackBuild        |  2 +-
 .../source/xap/imagemagick/imagemagick.SlackBuild  |  4 +-
 .../source/xap/imagemagick/policy.xml.diff.gz      |  2 +-
 .../source/xap/pidgin/pidgin.SlackBuild            |  2 +-
 .../source/xap/xine-lib/xine-lib.SlackBuild        |  9 +++--
 .../source/xap/xine-ui/xine-ui.SlackBuild          |  4 +-
 .../source/xap/xlockmore/slack-desc                |  2 +-
 .../source/xap/xlockmore/xlockmore.SlackBuild      | 10 ++---
 134 files changed, 378 insertions(+), 366 deletions(-)

(limited to 'slackware64-current/source')

diff --git a/slackware64-current/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/slackware64-current/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index 4ed14a480..f4002e747 100755
--- a/slackware64-current/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/slackware64-current/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=aaa_elflibs
 VERSION=${VERSION:-14.2}
-BUILD=${BUILD:-26}
+BUILD=${BUILD:-27}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/a/bash/bash.SlackBuild b/slackware64-current/source/a/bash/bash.SlackBuild
index 69649b761..691240177 100755
--- a/slackware64-current/source/a/bash/bash.SlackBuild
+++ b/slackware64-current/source/a/bash/bash.SlackBuild
@@ -31,7 +31,7 @@ fi
 PKG=$TMP/package-bash
 
 VERSION=${VERSION:-$(echo bash-*.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:
 MARCH=$( uname -m )
diff --git a/slackware64-current/source/a/elvis/elvis.SlackBuild b/slackware64-current/source/a/elvis/elvis.SlackBuild
index 14f3cc926..c243e226a 100755
--- a/slackware64-current/source/a/elvis/elvis.SlackBuild
+++ b/slackware64-current/source/a/elvis/elvis.SlackBuild
@@ -21,12 +21,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.2_0
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # 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/a/file/file.SlackBuild b/slackware64-current/source/a/file/file.SlackBuild
index d6ed07ee7..60597851e 100755
--- a/slackware64-current/source/a/file/file.SlackBuild
+++ b/slackware64-current/source/a/file/file.SlackBuild
@@ -97,7 +97,7 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/file-$VERSION \
   --enable-fsect-man5 \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # The generated $TMP/file-$VERSION/libtool is buggy.  I don't know if this is supposed
 # to work, but it certainly does, so... :-)
diff --git a/slackware64-current/source/a/gawk/gawk.SlackBuild b/slackware64-current/source/a/gawk/gawk.SlackBuild
index 5a6acb719..425299529 100755
--- a/slackware64-current/source/a/gawk/gawk.SlackBuild
+++ b/slackware64-current/source/a/gawk/gawk.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=gawk
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/a/gettext/gettext-tools.SlackBuild b/slackware64-current/source/a/gettext/gettext-tools.SlackBuild
index 3b32f2f57..ef90b2d03 100755
--- a/slackware64-current/source/a/gettext/gettext-tools.SlackBuild
+++ b/slackware64-current/source/a/gettext/gettext-tools.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.19.8.1
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j6 "}
 
diff --git a/slackware64-current/source/a/gettext/gettext.SlackBuild b/slackware64-current/source/a/gettext/gettext.SlackBuild
index 2f3e134b4..bed19eac7 100755
--- a/slackware64-current/source/a/gettext/gettext.SlackBuild
+++ b/slackware64-current/source/a/gettext/gettext.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.19.8.1
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j6 "}
 
diff --git a/slackware64-current/source/a/getty-ps/getty-ps.SlackBuild b/slackware64-current/source/a/getty-ps/getty-ps.SlackBuild
index 642256fe4..63c5a65c1 100755
--- a/slackware64-current/source/a/getty-ps/getty-ps.SlackBuild
+++ b/slackware64-current/source/a/getty-ps/getty-ps.SlackBuild
@@ -22,12 +22,12 @@
 
 
 VERSION=2.1.0b
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # 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/a/gpm/gpm.SlackBuild b/slackware64-current/source/a/gpm/gpm.SlackBuild
index 6c763657d..06e59143f 100755
--- a/slackware64-current/source/a/gpm/gpm.SlackBuild
+++ b/slackware64-current/source/a/gpm/gpm.SlackBuild
@@ -23,12 +23,12 @@
 # by: volkerdi@slackware.com
 
 VERSION=1.20.7
-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 ) ;;
@@ -39,8 +39,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-gpm
 
-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"
@@ -92,7 +92,7 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/a/gpm/slack-desc b/slackware64-current/source/a/gpm/slack-desc
index 7d0bdc952..82d49c6c7 100644
--- a/slackware64-current/source/a/gpm/slack-desc
+++ b/slackware64-current/source/a/gpm/slack-desc
@@ -13,7 +13,7 @@ gpm: to cut and paste text from the screen.  It also acts as a mouse
 gpm: server for applications running on the Linux console, such as the
 gpm: Midnight Commander file manager. 
 gpm:
-gpm: NOTE:  This program may cause problems when you start X on systems 
-gpm: that use a bus mouse (not common).  If you get an 'unable to open
-gpm: mouse device' error from X, disable /etc/rc.d/rc.gpm.
+gpm:
+gpm:
+gpm:
 gpm:
diff --git a/slackware64-current/source/a/gptfdisk/gptfdisk.SlackBuild b/slackware64-current/source/a/gptfdisk/gptfdisk.SlackBuild
index 054f83820..b2fd92ae5 100755
--- a/slackware64-current/source/a/gptfdisk/gptfdisk.SlackBuild
+++ b/slackware64-current/source/a/gptfdisk/gptfdisk.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2011  Eric Hameleers, Eindhoven, NL
-# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011, 2012, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,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 ) ;;
@@ -38,8 +38,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-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/a/grub/grub.SlackBuild b/slackware64-current/source/a/grub/grub.SlackBuild
index ba7ecd8b1..37881c2ea 100755
--- a/slackware64-current/source/a/grub/grub.SlackBuild
+++ b/slackware64-current/source/a/grub/grub.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=grub
 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
@@ -92,15 +92,9 @@ find . \
 # Use /boot/initrd.gz as a valid initrd name:
 zcat $CWD/initrd_naming.patch | patch -p1 --verbose || exit 1
 
-# Patch for recent glibc:
-zcat $CWD/txtHRnXiHYUrM.txt.gz | patch -p0 --verbose || exit 1
-
 # Support DejaVuSansMono font (dejavusansmono.pf2) by default:
 zcat $CWD/grub.dejavusansmono.gfxterm.font.diff.gz | patch -p1 --verbose || exit 1
 
-# Terminate EFI several times.  This is a workaround for broken UEFI firmware.
-zcat $CWD/grub.e75fdee420a7ad95e9a465c9699adc2e2e970440.terminate.efi.several.times.diff.gz | patch -p1 --verbose || exit 1
-
 # Fix security issue when reading username and password:
 zcat $CWD/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch.gz | patch -p1 --verbose || exit 1
 
@@ -116,7 +110,7 @@ build_grub() {
     --infodir=/usr/info \
     --mandir=/usr/man \
     --disable-werror \
-    $EFI_DO
+    $EFI_DO || exit 1
 
   # Build and install:
   make clean
@@ -129,13 +123,13 @@ build_grub() {
 
 # Build 32bit and 64bit efi targets if requested:
 if [ -n "$EFI32_FLAGS" ]; then
-  build_grub $EFI32_FLAGS
+  build_grub $EFI32_FLAGS || exit 1
 fi
 if [ -n "$EFI_FLAGS" ]; then
-  build_grub $EFI_FLAGS
+  build_grub $EFI_FLAGS || exit 1
 fi
 # Always end with regular build:
-build_grub
+build_grub || exit 1
 
 # Preserve the contents of /etc/grub.d/40_custom:
 mv $PKG/etc/grub.d/40_custom $PKG/etc/grub.d/40_custom.new
diff --git a/slackware64-current/source/a/grub/grub.dejavusansmono.gfxterm.font.diff.gz b/slackware64-current/source/a/grub/grub.dejavusansmono.gfxterm.font.diff.gz
index a05ebbab3..1bc42735e 100644
--- a/slackware64-current/source/a/grub/grub.dejavusansmono.gfxterm.font.diff.gz
+++ b/slackware64-current/source/a/grub/grub.dejavusansmono.gfxterm.font.diff.gz
@@ -1 +1 @@
-00cab53a5d80f50740d116030f265d604018c447
+bd07cf7afd8c0bed84d9c2acdebe42bbd9f6243b
diff --git a/slackware64-current/source/a/hwdata/hwdata.SlackBuild b/slackware64-current/source/a/hwdata/hwdata.SlackBuild
index 6381d27e0..32b2a74f7 100755
--- a/slackware64-current/source/a/hwdata/hwdata.SlackBuild
+++ b/slackware64-current/source/a/hwdata/hwdata.SlackBuild
@@ -75,6 +75,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Grab latest copies of pci and usb ids:
+rm -f usb.ids pci.ids
+lftpget https://pci-ids.ucw.cz/v2.2/pci.ids https://usb-ids.gowdy.us/usb.ids
+
 ./configure --libdir=/lib || exit 1
 #make download # grab latest copies of everything
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/a/less/less.SlackBuild b/slackware64-current/source/a/less/less.SlackBuild
index 3e6908daf..c1941823c 100755
--- a/slackware64-current/source/a/less/less.SlackBuild
+++ b/slackware64-current/source/a/less/less.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo less-*.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/a/minicom/minicom.SlackBuild b/slackware64-current/source/a/minicom/minicom.SlackBuild
index 3d38d2514..354b3bd01 100755
--- a/slackware64-current/source/a/minicom/minicom.SlackBuild
+++ b/slackware64-current/source/a/minicom/minicom.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.6.2
+VERSION=2.7
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
@@ -29,7 +29,7 @@ NUMJOBS=${NUMJOBS:--j6}
 # 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 ) ;;
@@ -40,8 +40,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-minicom
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mcpu=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -72,7 +72,7 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --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/a/minicom/slack-desc b/slackware64-current/source/a/minicom/slack-desc
index 67d1878c9..4aa6302bd 100644
--- a/slackware64-current/source/a/minicom/slack-desc
+++ b/slackware64-current/source/a/minicom/slack-desc
@@ -12,7 +12,7 @@ minicom: Minicom - a full featured menu-driven communications package similar
 minicom: to the DOS program 'Telix'.  Also includes sz/rz - utilities used to
 minicom: upload and download files using the Zmodem protocol.
 minicom:
-minicom:
+minicom: Homepage:  http://alioth.debian.org/projects/minicom
 minicom:
 minicom:
 minicom:
diff --git a/slackware64-current/source/a/procps-ng/procps-ng.SlackBuild b/slackware64-current/source/a/procps-ng/procps-ng.SlackBuild
index e46afd2ce..c667a3b9f 100755
--- a/slackware64-current/source/a/procps-ng/procps-ng.SlackBuild
+++ b/slackware64-current/source/a/procps-ng/procps-ng.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=procps-ng
-VERSION=${VERSION:-3.3.11}
+VERSION=${VERSION:-3.3.12}
 PSMISCVER=${PSMISCVER:-22.21}
 PROCINFONGVER=${PROCINFONGVER:-2.0.304}
 PROCINFOVER=${PROCINFOVER:-18}
diff --git a/slackware64-current/source/a/sed/sed.SlackBuild b/slackware64-current/source/a/sed/sed.SlackBuild
index 48b1cdcda..57faa01b6 100755
--- a/slackware64-current/source/a/sed/sed.SlackBuild
+++ b/slackware64-current/source/a/sed/sed.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 PKGNAM=sed
-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}
 
 CWD=$(pwd)
@@ -32,18 +32,15 @@ PKG=$TMP/package-sed
 # 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" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-  LIBDIRSUFFIX=""
-elif [ "$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"
@@ -58,7 +55,7 @@ mkdir -p $PKG $PKG
 
 cd $TMP
 rm -rf sed-$VERSION
-tar xvf $CWD/sed-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/sed-$VERSION.tar.xz || exit 1
 cd sed-$VERSION
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
@@ -71,7 +68,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/sed-$VERSION \
-  --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/a/splitvt/slack-desc b/slackware64-current/source/a/splitvt/slack-desc
index 0aa6ab24d..be5379bd6 100644
--- a/slackware64-current/source/a/splitvt/slack-desc
+++ b/slackware64-current/source/a/splitvt/slack-desc
@@ -13,7 +13,7 @@ splitvt: and runs a shell in each one.
 splitvt:
 splitvt: Splitvt was written by Sam Lantinga.
 splitvt:
-splitvt:
+splitvt: Homepage:  https://slouken.libsdl.org/projects/splitvt/
 splitvt:
 splitvt:
 splitvt:
diff --git a/slackware64-current/source/a/splitvt/splitvt.SlackBuild b/slackware64-current/source/a/splitvt/splitvt.SlackBuild
index 79a628aff..8ef945578 100755
--- a/slackware64-current/source/a/splitvt/splitvt.SlackBuild
+++ b/slackware64-current/source/a/splitvt/splitvt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,13 +21,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.6.5
+VERSION=1.6.6
 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 ) ;;
@@ -42,10 +42,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf splitvt-1.6.5
-tar xzvf $CWD/splitvt-1.6.5.tar.gz
-cd splitvt-1.6.5
-zcat $CWD/splitvt_1.6.5-9.diff.gz | patch -p1 --verbose || exit 1
+rm -rf splitvt-1.6.6
+tar xzvf $CWD/splitvt-1.6.6.tar.gz
+cd splitvt-1.6.6
 chown -R root:root .
 ./configure
 make || exit 1
diff --git a/slackware64-current/source/a/util-linux/util-linux.SlackBuild b/slackware64-current/source/a/util-linux/util-linux.SlackBuild
index 4d6046024..5e500ff23 100755
--- a/slackware64-current/source/a/util-linux/util-linux.SlackBuild
+++ b/slackware64-current/source/a/util-linux/util-linux.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -94,6 +94,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-line \
   --enable-mesg \
   --enable-partx \
+  --enable-pg \
   --enable-raw \
   --enable-rename \
   --enable-reset \
@@ -107,16 +108,9 @@ CFLAGS="$SLKCFLAGS" \
   --enable-libuuid \
   --disable-uuidd \
   --with-python=2 \
-  --without-readline \
   --build=$ARCH-slackware-linux \
   || exit 1
 
-# UNUSED, but maybe needed if we enable readline here:
-#
-# Yet another project that doesn't seem to get that -readline requires either
-# -ltermcap or -lncurses on systems that don't make assumptions...
-#sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile
-
 make $NUMBJOBS || make || exit 1
 make install DESTDIR=$PKG || make install DESTDIR=$PKG
 
diff --git a/slackware64-current/source/a/xfsprogs/xfsprogs.SlackBuild b/slackware64-current/source/a/xfsprogs/xfsprogs.SlackBuild
index b83d3f212..2b252a11b 100755
--- a/slackware64-current/source/a/xfsprogs/xfsprogs.SlackBuild
+++ b/slackware64-current/source/a/xfsprogs/xfsprogs.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
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo xfsprogs-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo xfsprogs-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -59,8 +59,8 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf xfsprogs-$VERSION
-tar xvf $CWD/xfsprogs-$VERSION.tar.?z* || exit 1
-cd xfsprogs-$VERSION
+tar xvf $CWD/xfsprogs-$VERSION.tar.xz || exit 1
+cd xfsprogs-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -69,9 +69,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Make sure you have the same version of autoconf as the
-# developers did...  ;-)
-autoconf
+## Make sure you have the same version of autoconf as the
+## developers did...  ;-)
+#autoconf
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -85,12 +85,11 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/xfsprogs-$VERSION \
   --enable-shared=yes \
   --enable-gettext=yes \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
-make install DIST_ROOT=$PKG
-make install-dev DIST_ROOT=$PKG
-make install-qa DIST_ROOT=$PKG
+make install DIST_ROOT=$PKG || exit 1
+make install-dev DIST_ROOT=$PKG || exit 1
 
 mv $PKG/usr/share/doc $PKG/usr
 mv $PKG/usr/doc/xfsprogs $PKG/usr/doc/xfsprogs-$VERSION
diff --git a/slackware64-current/source/a/xz/xz.SlackBuild b/slackware64-current/source/a/xz/xz.SlackBuild
index 8bac70d13..b065ae53d 100755
--- a/slackware64-current/source/a/xz/xz.SlackBuild
+++ b/slackware64-current/source/a/xz/xz.SlackBuild
@@ -62,6 +62,8 @@ case "$ARCH" in
              ;;
 esac
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 # Temporary build location.  This should *NOT* be a directory
 # path a non-root user could create later...
@@ -94,10 +96,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-rpath \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
-make || exit 1
-make DESTDIR=$PKG install
+make $NUMJOBS || make || exit 1
+make DESTDIR=$PKG install || exit 1
 
 # It might be advisable to have the libraries in /lib${LIBDIRSUFFIX}:
 mkdir -p $PKG/lib${LIBDIRSUFFIX}
diff --git a/slackware64-current/source/ap/bc/bc.SlackBuild b/slackware64-current/source/ap/bc/bc.SlackBuild
index 26e80aede..796c7c4e8 100755
--- a/slackware64-current/source/ap/bc/bc.SlackBuild
+++ b/slackware64-current/source/ap/bc/bc.SlackBuild
@@ -22,12 +22,12 @@
 
 PKGNAM=bc
 VERSION=${VERSION:-1.06.95}
-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 ) ;;
@@ -40,8 +40,8 @@ PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -72,7 +72,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-readline \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make -j4 || exit 1
diff --git a/slackware64-current/source/ap/bpe/bpe.SlackBuild b/slackware64-current/source/ap/bpe/bpe.SlackBuild
index 4be1f97d7..df272be84 100755
--- a/slackware64-current/source/ap/bpe/bpe.SlackBuild
+++ b/slackware64-current/source/ap/bpe/bpe.SlackBuild
@@ -22,20 +22,20 @@
 
 
 VERSION=2.01.00
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # 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 -mcpu=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -59,9 +59,9 @@ find . -perm 777 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr
-make
-make install DESTDIR=$PKG
+  --prefix=/usr || exit 1
+make || exit 1
+make install DESTDIR=$PKG || exit 1
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/slackware64-current/source/ap/ghostscript/ghostscript.SlackBuild b/slackware64-current/source/ap/ghostscript/ghostscript.SlackBuild
index 24110bcac..575393011 100755
--- a/slackware64-current/source/ap/ghostscript/ghostscript.SlackBuild
+++ b/slackware64-current/source/ap/ghostscript/ghostscript.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ if [ -r gnu-ghostscript-*.tar.xz ]; then
   SRCPREFIX="gnu-"
 fi
 VERSION=${VERSION:-$(echo $SRCPREFIX$PKGNAM-*.tar.xz | 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
@@ -123,6 +123,11 @@ make clean || exit 1
 make $NUMJOBS so || make so || exit 1
 make soinstall DESTDIR=$PKG || exit 1
 
+# Add back ijs-config, which is needed by at least gutenprint to find IJS
+# and produce a ghostscript driver:
+cat $CWD/ijs-config | sed -e "s/lib64/lib${LIBDIRSUFFIX}/g" > $PKG/usr/bin/ijs-config
+chmod 755 $PKG/usr/bin/ijs-config
+
 # Replace the default cidfmap with one containing additional
 # support for CJK printing:
 
diff --git a/slackware64-current/source/ap/gphoto2/gphoto2.SlackBuild b/slackware64-current/source/ap/gphoto2/gphoto2.SlackBuild
index f4415d142..baa8effec 100755
--- a/slackware64-current/source/ap/gphoto2/gphoto2.SlackBuild
+++ b/slackware64-current/source/ap/gphoto2/gphoto2.SlackBuild
@@ -74,7 +74,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/gphoto2-${VERSION} \
   --without-cdk \
   --enable-static=no \
-  --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/ap/gutenprint/gutenprint.SlackBuild b/slackware64-current/source/ap/gutenprint/gutenprint.SlackBuild
index de08b69f8..271f7bd3a 100755
--- a/slackware64-current/source/ap/gutenprint/gutenprint.SlackBuild
+++ b/slackware64-current/source/ap/gutenprint/gutenprint.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2015, 2016, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo gutenprint-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,7 +78,7 @@ find . \
   --enable-libgutenprintui2 \
   --enable-escputil \
   --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/ap/ispell/ispell.SlackBuild b/slackware64-current/source/ap/ispell/ispell.SlackBuild
index 44370a94a..a46a7ac01 100755
--- a/slackware64-current/source/ap/ispell/ispell.SlackBuild
+++ b/slackware64-current/source/ap/ispell/ispell.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2002-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2002-2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,13 +21,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=3.2.06
+VERSION=3.4.00
 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 ) ;;
@@ -49,7 +49,7 @@ mkdir -p $PKG $PKG
 
 cd $TMP
 rm -rf ispell-$VERSION
-tar xvf $CWD/ispell-$VERSION.tar.gz || exit 1
+tar xvf $CWD/ispell-$VERSION.tar.xz || exit 1
 cd ispell-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -58,8 +58,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/ispell.diff.gz | patch -p1 --verbose
-sed -i -e "s#/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" local.h
+zcat $CWD/local.h.linux.diff.gz | patch -p1 --verbose || exit 1
+sed -i -e "s#/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" local.h.linux
+cp -a local.h.linux local.h
 
 make || exit 1
 
@@ -68,7 +69,7 @@ sleep 2 # to make absolutely sure that config will have a later timestamp
 sed -i -e "s#/usr#$PKG&#g" config.sh
 
 mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},man}
-make install
+make install || exit 1
 
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}/ispell
   ln -sf americanmed.hash american.hash
diff --git a/slackware64-current/source/ap/joe/joe.SlackBuild b/slackware64-current/source/ap/joe/joe.SlackBuild
index b3a125525..5e20abb6b 100755
--- a/slackware64-current/source/ap/joe/joe.SlackBuild
+++ b/slackware64-current/source/ap/joe/joe.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -62,7 +62,7 @@ find . \
   --sysconfdir=/etc \
   --program-prefix="" \
   --program-suffix="" \
-  --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/ap/jove/jove.SlackBuild b/slackware64-current/source/ap/jove/jove.SlackBuild
index 65714d3cb..fd92fdb34 100755
--- a/slackware64-current/source/ap/jove/jove.SlackBuild
+++ b/slackware64-current/source/ap/jove/jove.SlackBuild
@@ -22,12 +22,12 @@
 
 
 VERSION=4.16.0.73
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # 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 ) ;;
@@ -36,8 +36,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-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"
@@ -74,7 +74,7 @@ sed -i -e "s#/lib/jove#/lib${LIBDIRSUFFIX}/jove#" \
   -e "s#^OPTFLAGS = .*#OPTFLAGS = $SLKCFLAGS#" Makefile
 
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG || exit 1
 
 # Create jove-recover symlink
 ( cd $PKG/usr/bin
diff --git a/slackware64-current/source/ap/mariadb/mariadb.SlackBuild b/slackware64-current/source/ap/mariadb/mariadb.SlackBuild
index 976f85170..697d57ae8 100755
--- a/slackware64-current/source/ap/mariadb/mariadb.SlackBuild
+++ b/slackware64-current/source/ap/mariadb/mariadb.SlackBuild
@@ -28,7 +28,7 @@
 
 PKGNAM=mariadb
 VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # To reduce the package size, the embedded server may be omitted.  Currently
 # only amarok uses this.  To build without embedded support, set this to NO.
diff --git a/slackware64-current/source/ap/mc/mc.SlackBuild b/slackware64-current/source/ap/mc/mc.SlackBuild
index b66b432db..3a79ac24b 100755
--- a/slackware64-current/source/ap/mc/mc.SlackBuild
+++ b/slackware64-current/source/ap/mc/mc.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo mc-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -69,8 +69,6 @@ zcat $CWD/mc.image.sh.geeqie.diff.gz | patch -p1 --verbose || exit 1
 
 # Upstream fixes:
 zcat $CWD/mc-3605-extfs.c-fix-buffer-overflow.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/mc-3611-fish-fix-perl-ls-helper.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/mc-syntax-error.patch.gz | patch -p0 --verbose || exit 1
 
 if [ ! -x ./configure ]; then
   ./autogen.sh
diff --git a/slackware64-current/source/ap/moc/moc.SlackBuild b/slackware64-current/source/ap/moc/moc.SlackBuild
index d61433c26..980e19186 100755
--- a/slackware64-current/source/ap/moc/moc.SlackBuild
+++ b/slackware64-current/source/ap/moc/moc.SlackBuild
@@ -79,7 +79,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --infodir=/usr/info \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/slackware64-current/source/ap/pamixer/pamixer.SlackBuild b/slackware64-current/source/ap/pamixer/pamixer.SlackBuild
index a2bed586c..8e8ee3961 100755
--- a/slackware64-current/source/ap/pamixer/pamixer.SlackBuild
+++ b/slackware64-current/source/ap/pamixer/pamixer.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=pamixer
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/slackware64-current/source/ap/powertop/powertop.SlackBuild b/slackware64-current/source/ap/powertop/powertop.SlackBuild
index f30676bdf..4bbd58936 100755
--- a/slackware64-current/source/ap/powertop/powertop.SlackBuild
+++ b/slackware64-current/source/ap/powertop/powertop.SlackBuild
@@ -27,7 +27,7 @@
 
 PKGNAM=powertop
 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/ap/sc/sc.SlackBuild b/slackware64-current/source/ap/sc/sc.SlackBuild
index b37a9e755..587d0fcc2 100755
--- a/slackware64-current/source/ap/sc/sc.SlackBuild
+++ b/slackware64-current/source/ap/sc/sc.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=7.16
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -55,6 +55,7 @@ explodepkg $CWD/_sc.tar.gz
 mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
 
 cd $TMP
+rm -r sc-$VERSION
 tar xvf $CWD/sc-$VERSION.tar.gz || exit 1
 cd sc-$VERSION || exit 1
 
diff --git a/slackware64-current/source/ap/screen/screen.SlackBuild b/slackware64-current/source/ap/screen/screen.SlackBuild
index 3bd4aa122..0a8ae1d5d 100755
--- a/slackware64-current/source/ap/screen/screen.SlackBuild
+++ b/slackware64-current/source/ap/screen/screen.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=screen
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/ap/texinfo/texinfo.SlackBuild b/slackware64-current/source/ap/texinfo/texinfo.SlackBuild
index 5ac714281..82f1de269 100755
--- a/slackware64-current/source/ap/texinfo/texinfo.SlackBuild
+++ b/slackware64-current/source/ap/texinfo/texinfo.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=texinfo
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/ap/xfsdump/xfsdump.SlackBuild b/slackware64-current/source/ap/xfsdump/xfsdump.SlackBuild
index 242221aba..ce6069dc7 100755
--- a/slackware64-current/source/ap/xfsdump/xfsdump.SlackBuild
+++ b/slackware64-current/source/ap/xfsdump/xfsdump.SlackBuild
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-$(echo xfsdump-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/d/clisp/clisp.SlackBuild b/slackware64-current/source/d/clisp/clisp.SlackBuild
index f98057df1..7b5e92606 100755
--- a/slackware64-current/source/d/clisp/clisp.SlackBuild
+++ b/slackware64-current/source/d/clisp/clisp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2013, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2015, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.49
-DIRNAME=2.49
-BUILD=${BUILD:-3}
+VERSION=2.49.20161111
+DIRNAME=2.49.20161111
+BUILD=${BUILD:-1}
 
 # Bundled libraries:
 FFCALLVER=20120424cvs
@@ -31,15 +31,15 @@ FFCALLVER=20120424cvs
 # 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"
@@ -116,16 +116,27 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Fix for compiling with readline-7.x:
+zcat $CWD/clisp-2.49-readline-7.0-rl_readline_state.patch.gz | patch -p1 --verbose || exit 1
+
+# I'll be unsafe if I want to:
+export FORCE_UNSAFE_CONFIGURE=1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --docdir=/usr/doc/clisp-$VERSION \
+  --with-module=asdf \
+  --with-module=berkeley-db \
+  --with-module=bindings/glibc \
   --with-module=clx/new-clx \
+  --with-module=dbus \
+  --with-module=gdbm \
+  --with-module=gtk2 \
   --with-module=pcre \
   --with-module=rawsock \
-  --with-module=wildcard \
   --with-module=zlib \
   --cbc with-gcc-wall \
   --with-dynamic-ffi || exit 1
@@ -135,10 +146,15 @@ cd with-gcc-wall
   --with-dynamic-ffi  \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-module=asdf \
+  --with-module=berkeley-db \
+  --with-module=bindings/glibc \
   --with-module=clx/new-clx \
+  --with-module=dbus \
+  --with-module=gdbm \
+  --with-module=gtk2 \
   --with-module=pcre \
   --with-module=rawsock \
-  --with-module=wildcard \
   --with-module=zlib \
   --srcdir=../src \
   > Makefile
diff --git a/slackware64-current/source/d/clisp/source.download b/slackware64-current/source/d/clisp/source.download
index 4de176999..20c51f6e8 100755
--- a/slackware64-current/source/d/clisp/source.download
+++ b/slackware64-current/source/d/clisp/source.download
@@ -1,3 +1,11 @@
 # http://www.haible.de/bruno/packages-ffcall-README.html
 # wget -c http://www.haible.de/bruno/gnu/ffcall-1.10.tar.gz
 # wget -c  ftp://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/ffcall-1.10-2.20080704cvs.fc10.src.rpm
+
+# The source for this package was pulled from upstream's mercurial repository.
+# Use the following commands to generate the tarball:
+#   hg clone http://hg.code.sf.net/p/clisp/clisp clisp-2.49
+#   rm -fr clisp-2.49/.hg*
+#   mv clisp-2.49 clisp-2.49.20161111
+#   tar cvJf clisp-2.49.20161111.tar.xz clisp-2.49.20161111
+
diff --git a/slackware64-current/source/d/cscope/cscope.SlackBuild b/slackware64-current/source/d/cscope/cscope.SlackBuild
index e88ece4d8..6c7885205 100755
--- a/slackware64-current/source/d/cscope/cscope.SlackBuild
+++ b/slackware64-current/source/d/cscope/cscope.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=cscope
 VERSION=${VERSION:-$(echo $(basename $(echo $PRGNAM-*.tar.xz | cut -f 2 -d -) .tar.xz) | cut -f 2 -d -)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/d/flex/flex.SlackBuild b/slackware64-current/source/d/flex/flex.SlackBuild
index b79f0e768..08cb54d39 100755
--- a/slackware64-current/source/d/flex/flex.SlackBuild
+++ b/slackware64-current/source/d/flex/flex.SlackBuild
@@ -79,7 +79,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/flex-${VERSION} \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/slackware64-current/source/d/gdb/gdb.SlackBuild b/slackware64-current/source/d/gdb/gdb.SlackBuild
index 41f6abfd6..05bffc7bf 100755
--- a/slackware64-current/source/d/gdb/gdb.SlackBuild
+++ b/slackware64-current/source/d/gdb/gdb.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=gdb
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/d/gnu-cobol/gnu-cobol.SlackBuild b/slackware64-current/source/d/gnu-cobol/gnu-cobol.SlackBuild
index 142c5cf7b..9ba60a282 100755
--- a/slackware64-current/source/d/gnu-cobol/gnu-cobol.SlackBuild
+++ b/slackware64-current/source/d/gnu-cobol/gnu-cobol.SlackBuild
@@ -23,12 +23,12 @@
 
 PKGNAM=gnu-cobol
 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
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
@@ -38,13 +38,7 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
diff --git a/slackware64-current/source/d/gnu-cobol/slack-desc b/slackware64-current/source/d/gnu-cobol/slack-desc
index 9a6c9b4f7..09c7a4820 100644
--- a/slackware64-current/source/d/gnu-cobol/slack-desc
+++ b/slackware64-current/source/d/gnu-cobol/slack-desc
@@ -15,5 +15,5 @@ gnu-cobol: COBOL into C and compiles the translated code using the native C
 gnu-cobol: compiler.  GNU Cobol was written by Roger While and Keisuke Nishida,
 gnu-cobol: with the invaluable assistance of many others.
 gnu-cobol:
-gnu-cobol: Homepage:  http://opencobol.add1tocobol.com/gnucobol
+gnu-cobol: Homepage:  ftp://ftp.gnu.org/gnu/gnucobol
 gnu-cobol:
diff --git a/slackware64-current/source/d/gperf/gperf.SlackBuild b/slackware64-current/source/d/gperf/gperf.SlackBuild
index 62062dff0..f7043d082 100755
--- a/slackware64-current/source/d/gperf/gperf.SlackBuild
+++ b/slackware64-current/source/d/gperf/gperf.SlackBuild
@@ -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 ) ;;
@@ -43,8 +43,8 @@ PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -74,7 +74,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/gperf-$VERSION \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/slackware64-current/source/d/guile/guile.SlackBuild b/slackware64-current/source/d/guile/guile.SlackBuild
index bb2debace..d338278a1 100755
--- a/slackware64-current/source/d/guile/guile.SlackBuild
+++ b/slackware64-current/source/d/guile/guile.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=guile
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/d/m4/m4.SlackBuild b/slackware64-current/source/d/m4/m4.SlackBuild
index 5623854c4..c10079c15 100755
--- a/slackware64-current/source/d/m4/m4.SlackBuild
+++ b/slackware64-current/source/d/m4/m4.SlackBuild
@@ -29,7 +29,7 @@ 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 ) ;;
@@ -40,7 +40,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-m4
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
diff --git a/slackware64-current/source/d/make/make.SlackBuild b/slackware64-current/source/d/make/make.SlackBuild
index 66f60f0b2..2dd308339 100755
--- a/slackware64-current/source/d/make/make.SlackBuild
+++ b/slackware64-current/source/d/make/make.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=make
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/d/perl/perl.SlackBuild b/slackware64-current/source/d/perl/perl.SlackBuild
index 1210b6dc9..82e23ee03 100755
--- a/slackware64-current/source/d/perl/perl.SlackBuild
+++ b/slackware64-current/source/d/perl/perl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009, 2010, 2011, 2012, 2013, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # originally by:  David Cantrell <david@slackware.com>
 # maintained by:  <volkerdi@slackware.com>
 
-VERSION=5.22.2
+VERSION=5.24.0
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -44,13 +44,13 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-perl
 
 # Additional required modules:
-DBDMYSQL=4.033
+DBDMYSQL=4.041
 DBI=1.636
 URI=1.71
 XMLPARSER=2.44
 XMLSIMPLE=2.22
 GETTEXT=1.07
-TERMREADKEY=2.33
+TERMREADKEY=2.37
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
@@ -145,10 +145,6 @@ fi
 # -Duseshrplib creates libperl.so
 # -Ubincompat5005 helps create DSO -> libperl.so
 
-# Kludge for gcc-4.2.4's needlessly changed output:
-cat makefile | grep -v '\<command-line\>' > foo
-mv foo makefile
-
 # Build perl
 make $NUMJOBS || exit 1
 make test
@@ -159,11 +155,9 @@ make install
   ln -sf perl$VERSION perl
   ln -sf c2ph pstruct
 )
-#mkdir -p /usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/${VERSION}/${ARCH}-linux-thread-multi
 
 # Install perl package:
 make install DESTDIR=$PKG
-#mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/${VERSION}/${ARCH}-linux-thread-multi
 
 # Add additional modules:
 ( cd ext
diff --git a/slackware64-current/source/d/ruby/ruby.SlackBuild b/slackware64-current/source/d/ruby/ruby.SlackBuild
index 51e9edaf6..a754e4cad 100755
--- a/slackware64-current/source/d/ruby/ruby.SlackBuild
+++ b/slackware64-current/source/d/ruby/ruby.SlackBuild
@@ -58,7 +58,7 @@ if [ "$ARCH" = "i586" ]; then
   OPTFLAGS=-O3
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
-  # Unknown if s390 is needs -O3.  Check to see if it compiles with -O2.
+  # Unknown if s390 also needs -O3.  Check to see if it compiles with -O2.
   SLKCFLAGS="-O3 -fno-strict-aliasing"
   OPTFLAGS=-O3
   LIBDIRSUFFIX=""
@@ -96,7 +96,7 @@ optflags=$OPTFLAGS \
   --enable-shared \
   --enable-pthread \
   --disable-install-capi \
-  --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/d/subversion/subversion.SlackBuild b/slackware64-current/source/d/subversion/subversion.SlackBuild
index 1df803128..74ea5eb85 100755
--- a/slackware64-current/source/d/subversion/subversion.SlackBuild
+++ b/slackware64-current/source/d/subversion/subversion.SlackBuild
@@ -84,7 +84,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-zlib=/usr \
   --with-pic \
   --with-kwallet \
-  --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/e/emacs/emacs.SlackBuild b/slackware64-current/source/e/emacs/emacs.SlackBuild
index 8c33196f9..095713259 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:-1}
+BUILD=${BUILD:-2}
 # 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/analitza b/slackware64-current/source/kde/build/analitza
index 0cfbf0888..00750edc0 100644
--- a/slackware64-current/source/kde/build/analitza
+++ b/slackware64-current/source/kde/build/analitza
@@ -1 +1 @@
-2
+3
diff --git a/slackware64-current/source/kde/build/calligra b/slackware64-current/source/kde/build/calligra
index 1e8b31496..7f8f011eb 100644
--- a/slackware64-current/source/kde/build/calligra
+++ b/slackware64-current/source/kde/build/calligra
@@ -1 +1 @@
-6
+7
diff --git a/slackware64-current/source/kde/build/kig b/slackware64-current/source/kde/build/kig
index b8626c4cf..7ed6ff82d 100644
--- a/slackware64-current/source/kde/build/kig
+++ b/slackware64-current/source/kde/build/kig
@@ -1 +1 @@
-4
+5
diff --git a/slackware64-current/source/kde/build/korundum b/slackware64-current/source/kde/build/korundum
index 00750edc0..b8626c4cf 100644
--- a/slackware64-current/source/kde/build/korundum
+++ b/slackware64-current/source/kde/build/korundum
@@ -1 +1 @@
-3
+4
diff --git a/slackware64-current/source/kde/build/lokalize b/slackware64-current/source/kde/build/lokalize
index 0cfbf0888..00750edc0 100644
--- a/slackware64-current/source/kde/build/lokalize
+++ b/slackware64-current/source/kde/build/lokalize
@@ -1 +1 @@
-2
+3
diff --git a/slackware64-current/source/kde/build/perlkde b/slackware64-current/source/kde/build/perlkde
index 0cfbf0888..00750edc0 100644
--- a/slackware64-current/source/kde/build/perlkde
+++ b/slackware64-current/source/kde/build/perlkde
@@ -1 +1 @@
-2
+3
diff --git a/slackware64-current/source/kde/build/perlqt b/slackware64-current/source/kde/build/perlqt
index 0cfbf0888..00750edc0 100644
--- a/slackware64-current/source/kde/build/perlqt
+++ b/slackware64-current/source/kde/build/perlqt
@@ -1 +1 @@
-2
+3
diff --git a/slackware64-current/source/kde/build/qtruby b/slackware64-current/source/kde/build/qtruby
index b8626c4cf..7ed6ff82d 100644
--- a/slackware64-current/source/kde/build/qtruby
+++ b/slackware64-current/source/kde/build/qtruby
@@ -1 +1 @@
-4
+5
diff --git a/slackware64-current/source/kde/patch/kdelibs.patch b/slackware64-current/source/kde/patch/kdelibs.patch
index c314b559c..8d3c4b5b5 100644
--- a/slackware64-current/source/kde/patch/kdelibs.patch
+++ b/slackware64-current/source/kde/patch/kdelibs.patch
@@ -6,6 +6,9 @@ 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/akonadi/akonadi.SlackBuild b/slackware64-current/source/l/akonadi/akonadi.SlackBuild
index 5fdadc423..c07cfdd99 100755
--- a/slackware64-current/source/l/akonadi/akonadi.SlackBuild
+++ b/slackware64-current/source/l/akonadi/akonadi.SlackBuild
@@ -26,7 +26,7 @@
 
 PKGNAM=akonadi
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:--j7}
 
diff --git a/slackware64-current/source/l/aspell/aspell.SlackBuild b/slackware64-current/source/l/aspell/aspell.SlackBuild
index 71c814616..e14a41017 100755
--- a/slackware64-current/source/l/aspell/aspell.SlackBuild
+++ b/slackware64-current/source/l/aspell/aspell.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=aspell
 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/l/elfutils/slack-desc b/slackware64-current/source/l/elfutils/slack-desc
index ad242d720..64d42f37e 100644
--- a/slackware64-current/source/l/elfutils/slack-desc
+++ b/slackware64-current/source/l/elfutils/slack-desc
@@ -14,6 +14,6 @@ elfutils: (for listing the section sizes of an object or archive file),
 elfutils: strip (for discarding symbols), readelf (to see the raw ELF file
 elfutils: structures), and elflint (to check for well-formed ELF files).
 elfutils:
-elfutils: Project home:  http://fedorahosted.org/releases/e/l/elfutils/
+elfutils: Project home:  ftp://sourceware.org/pub/elfutils/
 elfutils:
 elfutils:
diff --git a/slackware64-current/source/l/enchant/enchant.SlackBuild b/slackware64-current/source/l/enchant/enchant.SlackBuild
index 245a9506d..f64adcbb9 100755
--- a/slackware64-current/source/l/enchant/enchant.SlackBuild
+++ b/slackware64-current/source/l/enchant/enchant.SlackBuild
@@ -25,14 +25,14 @@
 
 PKGNAM=enchant
 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 "}
 
 # 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 ) ;;
@@ -43,8 +43,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" = "s390" ]; then
   SLKCFLAGS="-O2"
diff --git a/slackware64-current/source/l/hunspell/hunspell.SlackBuild b/slackware64-current/source/l/hunspell/hunspell.SlackBuild
index 93bb2895b..d7b478004 100755
--- a/slackware64-current/source/l/hunspell/hunspell.SlackBuild
+++ b/slackware64-current/source/l/hunspell/hunspell.SlackBuild
@@ -38,7 +38,7 @@ mkdir -p $TMP $PKG
 MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
   case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
+    i?86)    export ARCH=i586 ;;
     armv7hl) export ARCH=$MARCH ;;
     arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
@@ -46,8 +46,8 @@ if [ -z "$ARCH" ]; then
   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"
@@ -81,6 +81,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+autoreconf -vif
+
 # Build and install:
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/slackware64-current/source/l/libcaca/libcaca.SlackBuild b/slackware64-current/source/l/libcaca/libcaca.SlackBuild
index 709c61c00..7d0148dd8 100755
--- a/slackware64-current/source/l/libcaca/libcaca.SlackBuild
+++ b/slackware64-current/source/l/libcaca/libcaca.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 
 PKGNAM=libcaca
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+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 ) ;;
@@ -43,8 +43,8 @@ PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-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"
@@ -79,12 +79,14 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --program-prefix= \
   --program-suffix= \
+  --disable-doc \
   --disable-imlib2 \
   --disable-ruby \
+  --disable-static \
   --enable-slang \
   --enable-ncurses \
   --enable-x11 \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/slackware64-current/source/l/libcap/libcap.SlackBuild b/slackware64-current/source/l/libcap/libcap.SlackBuild
index 796da7784..31cb1fb47 100755
--- a/slackware64-current/source/l/libcap/libcap.SlackBuild
+++ b/slackware64-current/source/l/libcap/libcap.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PKGNAM=libcap
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -32,15 +32,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" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP 
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 zcat $CWD/libcap.capability.h.fix.broken.includes.diff.gz | patch -p1 || exit 1
diff --git a/slackware64-current/source/l/libcdio/libcdio.SlackBuild b/slackware64-current/source/l/libcdio/libcdio.SlackBuild
index 855f2c250..1c9f30b20 100755
--- a/slackware64-current/source/l/libcdio/libcdio.SlackBuild
+++ b/slackware64-current/source/l/libcdio/libcdio.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=libcdio
 VERSION=${VERSION:-$(echo $(basename $(echo $PKGNAM-*.tar.xz | cut -f 2 -d -) .tar.xz) | cut -f 2 -d -)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/l/libgphoto2/libgphoto2.SlackBuild b/slackware64-current/source/l/libgphoto2/libgphoto2.SlackBuild
index ccfb26203..55d69ef3e 100755
--- a/slackware64-current/source/l/libgphoto2/libgphoto2.SlackBuild
+++ b/slackware64-current/source/l/libgphoto2/libgphoto2.SlackBuild
@@ -81,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --with-doc-dir=/usr/doc/$PKGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 
diff --git a/slackware64-current/source/l/libnjb/libnjb.SlackBuild b/slackware64-current/source/l/libnjb/libnjb.SlackBuild
index a91aa6608..816f292e0 100755
--- a/slackware64-current/source/l/libnjb/libnjb.SlackBuild
+++ b/slackware64-current/source/l/libnjb/libnjb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,13 @@
 
 
 PKGNAM=libnjb
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+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:
 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 ) ;;
@@ -43,8 +43,8 @@ PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-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"
@@ -59,7 +59,7 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -78,7 +78,7 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/${PKGNAM}-$VERSION \
   --disable-static \
   --enable-hotplugging \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/slackware64-current/source/l/parted/parted.SlackBuild b/slackware64-current/source/l/parted/parted.SlackBuild
index 71d47f395..9fd557f1c 100755
--- a/slackware64-current/source/l/parted/parted.SlackBuild
+++ b/slackware64-current/source/l/parted/parted.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=parted
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/l/parted/parted.SlackBuild.static b/slackware64-current/source/l/parted/parted.SlackBuild.static
index d3bf359a4..eca8f1653 100755
--- a/slackware64-current/source/l/parted/parted.SlackBuild.static
+++ b/slackware64-current/source/l/parted/parted.SlackBuild.static
@@ -23,7 +23,7 @@
 
 PKGNAM=parted
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/l/pilot-link/pilot-link.SlackBuild b/slackware64-current/source/l/pilot-link/pilot-link.SlackBuild
index debb01a20..7e1692449 100755
--- a/slackware64-current/source/l/pilot-link/pilot-link.SlackBuild
+++ b/slackware64-current/source/l/pilot-link/pilot-link.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-0.12.5}
-BUILD=${BUILD:-11}
+BUILD=${BUILD:-12}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/l/taglib/taglib.SlackBuild b/slackware64-current/source/l/taglib/taglib.SlackBuild
index 9841c232b..658f00a0b 100755
--- a/slackware64-current/source/l/taglib/taglib.SlackBuild
+++ b/slackware64-current/source/l/taglib/taglib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -75,6 +75,7 @@ cmake \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \
   -DLIB_SUFFIX="${LIBDIRSUFFIX}" \
+  -DBUILD_SHARED_LIBS=ON \
   -DWITH_MP4=ON \
   -DWITH_ASF=ON \
   .
diff --git a/slackware64-current/source/l/virtuoso-ose/virtuoso-ose.SlackBuild b/slackware64-current/source/l/virtuoso-ose/virtuoso-ose.SlackBuild
index 87454bb78..222e0ca8d 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:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/l/vte/vte.SlackBuild b/slackware64-current/source/l/vte/vte.SlackBuild
index 34debeb33..640ea6a60 100755
--- a/slackware64-current/source/l/vte/vte.SlackBuild
+++ b/slackware64-current/source/l/vte/vte.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=vte
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/l/zlib/zlib.SlackBuild b/slackware64-current/source/l/zlib/zlib.SlackBuild
index eb2842806..eceddecb3 100755
--- a/slackware64-current/source/l/zlib/zlib.SlackBuild
+++ b/slackware64-current/source/l/zlib/zlib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-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 ) ;;
@@ -39,11 +39,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-zlib
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-  LIBDIRSUFFIX=""
-elif [ "$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"
@@ -71,31 +68,13 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr
-make clean
-make || exit 1
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --shared
+  --shared || exit 1
 make || exit 1
-
-mkdir -p $PKG/usr/include
-cp -a zlib.h zconf.h $PKG/usr/include
-chmod 644 $PKG/usr/include/*
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-cp -a libz.a libz.so* $PKG/usr/lib${LIBDIRSUFFIX}
-chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*
-chmod 644 $PKG/usr/lib${LIBDIRSUFFIX}/libz.a
-mkdir -p $PKG/usr/man/man3
-cat zlib.3 | gzip -9c > $PKG/usr/man/man3/zlib.3.gz
-
-# Add pkgconfig file:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-cat zlib.pc > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/zlib.pc
+make install DESTDIR=$PKG || exit 1
 
 # Now that libkmod requires libz, we had better move the shared library
 # up a level:
@@ -114,6 +93,17 @@ mkdir $PKG/lib${LIBDIRSUFFIX}
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
+# Move man page directory:
+mv $PKG/usr/share/man $PKG/usr
+rmdir $PKG/usr/share
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
 mkdir -p $PKG/usr/doc/zlib-$VERSION
 cp -a \
   FAQ INDEX README* \
diff --git a/slackware64-current/source/n/NetworkManager/NetworkManager.SlackBuild b/slackware64-current/source/n/NetworkManager/NetworkManager.SlackBuild
index dea24f844..ca8c85fac 100755
--- a/slackware64-current/source/n/NetworkManager/NetworkManager.SlackBuild
+++ b/slackware64-current/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -25,7 +25,7 @@
 
 PKGNAM=NetworkManager
 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:
 MARCH=$( uname -m )
diff --git a/slackware64-current/source/n/alpine/alpine.SlackBuild b/slackware64-current/source/n/alpine/alpine.SlackBuild
index 9f2a91c87..31ccbc7ed 100755
--- a/slackware64-current/source/n/alpine/alpine.SlackBuild
+++ b/slackware64-current/source/n/alpine/alpine.SlackBuild
@@ -23,8 +23,8 @@
 
 PKGNAM=alpine
 VERSION=${VERSION:-2.20}
-ALPINEBUILD=${ALPINEBUILD:-2}
-IMAPDBUILD=${IMAPDBUILD:-2}
+ALPINEBUILD=${ALPINEBUILD:-3}
+IMAPDBUILD=${IMAPDBUILD:-3}
 PINEPGP=${PINEPGP:-0.18.0}
 
 # Automatically determine the architecture we're building on:
diff --git a/slackware64-current/source/n/bind/bind.SlackBuild b/slackware64-current/source/n/bind/bind.SlackBuild
index 7e91b16d4..083184b06 100755
--- a/slackware64-current/source/n/bind/bind.SlackBuild
+++ b/slackware64-current/source/n/bind/bind.SlackBuild
@@ -22,7 +22,7 @@
 
 
 PKGNAM=bind
-VERSION=${VERSION:-9.10.4-P4}
+VERSION=${VERSION:-9.11.0-P2}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/slackware64-current/source/n/elm/elm.SlackBuild b/slackware64-current/source/n/elm/elm.SlackBuild
index 6ce92b466..d9cddcedc 100755
--- a/slackware64-current/source/n/elm/elm.SlackBuild
+++ b/slackware64-current/source/n/elm/elm.SlackBuild
@@ -21,12 +21,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.5.8
-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 ) ;;
diff --git a/slackware64-current/source/n/epic5/epic5.SlackBuild b/slackware64-current/source/n/epic5/epic5.SlackBuild
index 362658417..5e506ae74 100755
--- a/slackware64-current/source/n/epic5/epic5.SlackBuild
+++ b/slackware64-current/source/n/epic5/epic5.SlackBuild
@@ -73,7 +73,7 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --with-tcl=/usr/lib${LIBDIRSUFFIX}/tclConfig.sh \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install IP=$PKG || exit 1
diff --git a/slackware64-current/source/n/gnupg/gnupg.SlackBuild b/slackware64-current/source/n/gnupg/gnupg.SlackBuild
index de2228adc..a2360232e 100755
--- a/slackware64-current/source/n/gnupg/gnupg.SlackBuild
+++ b/slackware64-current/source/n/gnupg/gnupg.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=gnupg
 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/n/gnupg2/gnupg2.SlackBuild b/slackware64-current/source/n/gnupg2/gnupg2.SlackBuild
index 0f41877c3..3b95f36b7 100755
--- a/slackware64-current/source/n/gnupg2/gnupg2.SlackBuild
+++ b/slackware64-current/source/n/gnupg2/gnupg2.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=gnupg2
 VERSION=${VERSION:-$(echo gnupg-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -82,7 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/gnupg2-$VERSION \
   --program-prefix="" \
   --program-suffix="" \
-  --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/n/gnutls/gnutls.SlackBuild b/slackware64-current/source/n/gnutls/gnutls.SlackBuild
index 9b1a00b1c..87216aaff 100755
--- a/slackware64-current/source/n/gnutls/gnutls.SlackBuild
+++ b/slackware64-current/source/n/gnutls/gnutls.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007, 2008, 2009, 2010, 2016  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2016, 2017  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -84,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-included-libtasn1 \
   --enable-openssl-compatibility \
   --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --host=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -114,7 +114,8 @@ fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README* THANKS \
+  AUTHORS COPYING* INSTALL LICENSE NEWS README* THANKS \
+  doc/COPYING* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
@@ -125,6 +126,13 @@ if [ -r ChangeLog ]; then
   touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 
+# Likewise for the bloated NEWS:
+if [ -r NEWS ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+  touch -r NEWS $DOCSDIR/NEWS
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/slackware64-current/source/n/iftop/iftop.SlackBuild b/slackware64-current/source/n/iftop/iftop.SlackBuild
index 0361a4756..ca7cdd352 100755
--- a/slackware64-current/source/n/iftop/iftop.SlackBuild
+++ b/slackware64-current/source/n/iftop/iftop.SlackBuild
@@ -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 ) ;;
@@ -43,8 +43,8 @@ PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-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"
@@ -79,7 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/slackware64-current/source/n/iptraf-ng/iptraf-ng.SlackBuild b/slackware64-current/source/n/iptraf-ng/iptraf-ng.SlackBuild
index 65dbe2612..45ef1f35f 100755
--- a/slackware64-current/source/n/iptraf-ng/iptraf-ng.SlackBuild
+++ b/slackware64-current/source/n/iptraf-ng/iptraf-ng.SlackBuild
@@ -23,12 +23,12 @@
 
 PKGNAM=iptraf-ng
 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
   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 ) ;;
@@ -37,8 +37,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-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"
@@ -78,7 +78,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --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/n/irssi/irssi.SlackBuild b/slackware64-current/source/n/irssi/irssi.SlackBuild
index 23799e7fd..16efe5963 100755
--- a/slackware64-current/source/n/irssi/irssi.SlackBuild
+++ b/slackware64-current/source/n/irssi/irssi.SlackBuild
@@ -25,8 +25,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-irssi
 
-VERSION=0.8.20
-DIRCD=0.8.20
+VERSION=0.8.21
+DIRCD=0.8.21
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/slackware64-current/source/n/lftp/slack-desc b/slackware64-current/source/n/lftp/slack-desc
index 5d6a0c2c4..58b40b5d0 100644
--- a/slackware64-current/source/n/lftp/slack-desc
+++ b/slackware64-current/source/n/lftp/slack-desc
@@ -14,6 +14,6 @@ lftp: ftp, ftps, http, https, hftp, fish and file.  Every operation in lftp
 lftp: is reliable, that is any non-fatal error is ignored and the operation
 lftp: is retried.  lftp has shell-like command syntax.  lftp has a built in
 lftp: mirror feature which can download or upload a whole directory tree.
-lftp: To learn about many more features of lftp, see 'man lftp'.
 lftp:
+lftp: Homepage:  http://lftp.tech
 lftp:
diff --git a/slackware64-current/source/n/links/links.SlackBuild b/slackware64-current/source/n/links/links.SlackBuild
index 943279a37..9f785efe0 100755
--- a/slackware64-current/source/n/links/links.SlackBuild
+++ b/slackware64-current/source/n/links/links.SlackBuild
@@ -74,7 +74,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-graphics \
   --without-x \
   --without-sdl \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 
diff --git a/slackware64-current/source/n/lynx/lynx.SlackBuild b/slackware64-current/source/n/lynx/lynx.SlackBuild
index 9ee032f9a..8dab223d3 100755
--- a/slackware64-current/source/n/lynx/lynx.SlackBuild
+++ b/slackware64-current/source/n/lynx/lynx.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGVER=2.8.8rel.2
 DIRVER=2-8-8
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/n/mcabber/mcabber.SlackBuild b/slackware64-current/source/n/mcabber/mcabber.SlackBuild
index bef6c821b..8920ac946 100755
--- a/slackware64-current/source/n/mcabber/mcabber.SlackBuild
+++ b/slackware64-current/source/n/mcabber/mcabber.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=mcabber
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/n/metamail/metamail.SlackBuild b/slackware64-current/source/n/metamail/metamail.SlackBuild
index cbf9241f9..0e42e5afb 100755
--- a/slackware64-current/source/n/metamail/metamail.SlackBuild
+++ b/slackware64-current/source/n/metamail/metamail.SlackBuild
@@ -22,12 +22,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.7
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 # 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 ) ;;
@@ -36,8 +36,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-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"
@@ -87,7 +87,7 @@ CFLAGS="$SLKCFLAGS" \
   --disable-static \
   --program-prefix="" \
   --program-suffix="" \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 ( cd bin
   cat showexternal | perl -pi -e 's|sensible-pager|more|' > se
diff --git a/slackware64-current/source/n/mtr/mtr.SlackBuild b/slackware64-current/source/n/mtr/mtr.SlackBuild
index c3b4ded87..b5f1aa0b0 100755
--- a/slackware64-current/source/n/mtr/mtr.SlackBuild
+++ b/slackware64-current/source/n/mtr/mtr.SlackBuild
@@ -73,7 +73,7 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --without-gtk \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
diff --git a/slackware64-current/source/n/ncftp/ncftp.SlackBuild b/slackware64-current/source/n/ncftp/ncftp.SlackBuild
index f859b0878..9b7777b19 100755
--- a/slackware64-current/source/n/ncftp/ncftp.SlackBuild
+++ b/slackware64-current/source/n/ncftp/ncftp.SlackBuild
@@ -22,13 +22,13 @@
 
 
 PKGNAM=ncftp
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 2 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 2 -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 ) ;;
@@ -37,8 +37,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -55,7 +55,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ncftp-$VERSION
-tar xvf $CWD/ncftp-$VERSION-src.tar.?z* || exit 1
+tar xvf $CWD/ncftp-$VERSION-src.tar.xz || exit 1
 cd ncftp-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -69,7 +69,7 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --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/n/ncftp/slack-desc b/slackware64-current/source/n/ncftp/slack-desc
index 61a0807d8..bad21fc00 100644
--- a/slackware64-current/source/n/ncftp/slack-desc
+++ b/slackware64-current/source/n/ncftp/slack-desc
@@ -13,7 +13,7 @@ ncftp: Protocol.  This program allows a user to transfer files to and from a
 ncftp: remote network site, and offers additional features that are not found
 ncftp: in the standard interface for ftp.
 ncftp:
-ncftp:
+ncftp: Homepage:  http://www.ncftp.com/ncftp/
 ncftp:
 ncftp:
 ncftp:
diff --git a/slackware64-current/source/n/net-snmp/net-snmp.SlackBuild b/slackware64-current/source/n/net-snmp/net-snmp.SlackBuild
index 864fdd5a5..04c84b9d4 100755
--- a/slackware64-current/source/n/net-snmp/net-snmp.SlackBuild
+++ b/slackware64-current/source/n/net-snmp/net-snmp.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=net-snmp
 VERSION=${VERSION:-$(echo $PKGNAM-*.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
@@ -61,6 +61,10 @@ tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 zcat $CWD/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/net-snmp-5.7.3-Fix-Makefile-PL.patch.gz | patch -p1 --verbose || exit 1
+
+# Replace a typedef that conflicts with perl:
+zcat $CWD/net-snmp-5.7.3-Remove-U64-typedef.patch.gz | patch -p1 --verbose || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
diff --git a/slackware64-current/source/n/net-tools/ipmask.8 b/slackware64-current/source/n/net-tools/ipmask.8
index 2f9815010..ee85f74ce 100644
--- a/slackware64-current/source/n/net-tools/ipmask.8
+++ b/slackware64-current/source/n/net-tools/ipmask.8
@@ -12,7 +12,6 @@
 ipmask \- determine network and broadcast addresses given a decimal netmask and IP address.
 .SH SYNOPSIS
 .B ipmask <decimal netmask> <decimal IP address>
-.BI packagename
 .SH DESCRIPTION
 .B ipmask
 is a simple program to calculate broadcast and network addresses from a decimal netmask and a decimal IP address.  It is used in the Slackware networking script /etc/rc.d/rc.inet1, and in the netconfig script.
diff --git a/slackware64-current/source/n/netkit-ftp/netkit-ftp.SlackBuild b/slackware64-current/source/n/netkit-ftp/netkit-ftp.SlackBuild
index f71e5ab63..8bdf6cde7 100755
--- a/slackware64-current/source/n/netkit-ftp/netkit-ftp.SlackBuild
+++ b/slackware64-current/source/n/netkit-ftp/netkit-ftp.SlackBuild
@@ -22,12 +22,12 @@
 
 
 VERSION=0.17
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # 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/n/netkit-ntalk/netkit-ntalk.SlackBuild b/slackware64-current/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
index 9b41fa2d6..ed992eedc 100755
--- a/slackware64-current/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
+++ b/slackware64-current/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
@@ -22,12 +22,12 @@
 
 
 VERSION=0.17
-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 ) ;;
diff --git a/slackware64-current/source/n/netwatch/netwatch.SlackBuild b/slackware64-current/source/n/netwatch/netwatch.SlackBuild
index 40338d61b..6ec7d838f 100755
--- a/slackware64-current/source/n/netwatch/netwatch.SlackBuild
+++ b/slackware64-current/source/n/netwatch/netwatch.SlackBuild
@@ -23,7 +23,7 @@
 
 VERSION=1.3.1
 EXTRAVERSION=${EXTRAVERSION:-2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/n/nftables/nftables.SlackBuild b/slackware64-current/source/n/nftables/nftables.SlackBuild
index b9a04f1b2..ac05cbc11 100755
--- a/slackware64-current/source/n/nftables/nftables.SlackBuild
+++ b/slackware64-current/source/n/nftables/nftables.SlackBuild
@@ -79,9 +79,11 @@ LIBS="-lncursesw" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-static \
   --build=$ARCH-slackware-linux || exit 1
 
+# Not working yet for whatever reason...
+#  --with-xtables \
+
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
diff --git a/slackware64-current/source/n/nn/nn.SlackBuild b/slackware64-current/source/n/nn/nn.SlackBuild
index 41757fcca..327f112be 100755
--- a/slackware64-current/source/n/nn/nn.SlackBuild
+++ b/slackware64-current/source/n/nn/nn.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2002-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2002-2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,20 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=6.7.3
-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 ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   MFILE="m-i80386.h"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -65,6 +65,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/nn_6.7.3-10.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/nn.diff.gz \
     | sed -e "s#m-sparc.h#${MFILE}#" \
     | sed -e "s#/usr/lib/nn#/usr/lib${LIBDIRSUFFIX}/nn#" \
@@ -73,17 +74,19 @@ if [ $ARCH = "x86_64" ]; then
 	zcat $CWD/m-x86_64.h.gz > conf/m-x86_64.h
 fi
 zcat $CWD/nn.badnntphost.diff.gz | patch -p1 --verbose || exit 1
-# Taken from slamd64 (who adapted an old Ubuntu patch);
-# Besides adding DESTDIR support, it gets rid of the hardlinks that are created:
-zcat $CWD/nn.destdir.diff.gz | patch -p1 --verbose  || exit 1
 
 cat config.h-dist | sed -e "s#m-sparc.h#${MFILE}#" > config.h
 make all
 
-echo "*** USE install option 's'"
-sleep 5
+# We'll pipe the correct options to ./inst
+#echo "*** USE install option 's'"
+#sleep 5
+
 mkdir -p $PKG/etc $PKG/usr/bin $PKG/usr/lib${LIBDIRSUFFIX} $PKG/usr/man/man{1,8}
-DESTDIR=$PKG ./inst
+cat << EOF | DESTDIR=$PKG ./inst
+s
+q
+EOF
 
 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/n/nn/nn.badnntphost.diff.gz b/slackware64-current/source/n/nn/nn.badnntphost.diff.gz
index 01a689fcd..4ce79e315 100644
--- a/slackware64-current/source/n/nn/nn.badnntphost.diff.gz
+++ b/slackware64-current/source/n/nn/nn.badnntphost.diff.gz
@@ -1 +1 @@
-77438f50b57b497c43f95d5939bbcd5b7834dcc8
+7595d3c0166936fdcdca4ff512d20b8d56f7acf6
diff --git a/slackware64-current/source/n/ntp/ntp.SlackBuild b/slackware64-current/source/n/ntp/ntp.SlackBuild
index 21ca6248a..1c1f0b8b9 100755
--- a/slackware64-current/source/n/ntp/ntp.SlackBuild
+++ b/slackware64-current/source/n/ntp/ntp.SlackBuild
@@ -22,7 +22,7 @@
 
 PKGNAM=ntp
 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/n/obexftp/obexftp.SlackBuild b/slackware64-current/source/n/obexftp/obexftp.SlackBuild
index 13eba4bcd..d4ab25838 100755
--- a/slackware64-current/source/n/obexftp/obexftp.SlackBuild
+++ b/slackware64-current/source/n/obexftp/obexftp.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2015, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -71,9 +71,7 @@ find . \
 
 # Thanks to Fedora for these
 zcat $CWD/patches/obexftp-0.24-fix-absurd-install-path.patch.gz | patch -p1 || exit 1
-zcat $CWD/patches/obexftp-0.24-fuse.patch.gz | patch -p1 || exit 1
 zcat $CWD/patches/obexftp-norpath.patch.gz | patch -p1 || exit 1
-zcat $CWD/patches/obexftp-pkgconfig_requires.patch.gz | patch -p1 || exit 1
 
 mkdir -p build
 cd build
diff --git a/slackware64-current/source/n/php/php.SlackBuild b/slackware64-current/source/n/php/php.SlackBuild
index 2e8748ce9..4e11a97c9 100755
--- a/slackware64-current/source/n/php/php.SlackBuild
+++ b/slackware64-current/source/n/php/php.SlackBuild
@@ -73,7 +73,7 @@ if [ -r $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a ]; then
   ls -l $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a
   sleep 5
 else
-  ( cd $CWD/../alpine ; ./alpine.SlackBuild || exit 1 ) || exit 1
+  ( cd $CWD/../alpine ; VERSION=${ALPINE} ; ./alpine.SlackBuild || exit 1 ) || exit 1
   ( cd $TMP/alpine-${ALPINE}/imap/c-client
     strip -g c-client.a
     mkdir -p $IMAPLIBDIR/lib${LIBDIRSUFFIX}
diff --git a/slackware64-current/source/n/pinentry/pinentry.SlackBuild b/slackware64-current/source/n/pinentry/pinentry.SlackBuild
index 3329405b2..61d43f971 100755
--- a/slackware64-current/source/n/pinentry/pinentry.SlackBuild
+++ b/slackware64-current/source/n/pinentry/pinentry.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=pinentry
 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/n/proftpd/proftpd.SlackBuild b/slackware64-current/source/n/proftpd/proftpd.SlackBuild
index db0d0d267..34d02372d 100755
--- a/slackware64-current/source/n/proftpd/proftpd.SlackBuild
+++ b/slackware64-current/source/n/proftpd/proftpd.SlackBuild
@@ -23,7 +23,7 @@
 
 VERSION=1.3.5b
 DIRVER=1.3.5b
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/n/snownews/snownews.SlackBuild b/slackware64-current/source/n/snownews/snownews.SlackBuild
index 75bc28757..2b209867b 100755
--- a/slackware64-current/source/n/snownews/snownews.SlackBuild
+++ b/slackware64-current/source/n/snownews/snownews.SlackBuild
@@ -22,12 +22,12 @@
 
 PKGNAM=snownews
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # 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 ) ;;
@@ -36,8 +36,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-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/n/telnet/telnet.SlackBuild b/slackware64-current/source/n/telnet/telnet.SlackBuild
index d52349300..ff7752794 100755
--- a/slackware64-current/source/n/telnet/telnet.SlackBuild
+++ b/slackware64-current/source/n/telnet/telnet.SlackBuild
@@ -22,12 +22,12 @@
 
 
 VERSION=0.17
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # 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/n/tftp-hpa/tftp-hpa.SlackBuild b/slackware64-current/source/n/tftp-hpa/tftp-hpa.SlackBuild
index 0e783c93f..05a613ae7 100755
--- a/slackware64-current/source/n/tftp-hpa/tftp-hpa.SlackBuild
+++ b/slackware64-current/source/n/tftp-hpa/tftp-hpa.SlackBuild
@@ -23,12 +23,12 @@
 
 PKGNAM=tftp-hpa
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # 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/n/tin/tin.SlackBuild b/slackware64-current/source/n/tin/tin.SlackBuild
index b8304b186..4f4599567 100755
--- a/slackware64-current/source/n/tin/tin.SlackBuild
+++ b/slackware64-current/source/n/tin/tin.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=tin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/n/wpa_supplicant/patches/quiet-scan-results-message.diff b/slackware64-current/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff
index 533ad5cc0..7f85e8102 100644
--- a/slackware64-current/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff
+++ b/slackware64-current/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff
@@ -1,9 +1,9 @@
---- ./wpa_supplicant/events.c.orig	2014-10-09 09:41:31.000000000 -0500
-+++ ./wpa_supplicant/events.c	2014-12-04 13:09:49.477850355 -0600
-@@ -1330,11 +1330,11 @@
- 		wpa_s->own_scan_running, wpa_s->external_scan_running);
+--- ./wpa_supplicant/events.c.orig	2017-01-05 11:29:16.968898845 -0600
++++ ./wpa_supplicant/events.c	2017-01-05 11:31:13.515907254 -0600
+@@ -1555,11 +1555,11 @@
  	if (wpa_s->last_scan_req == MANUAL_SCAN_REQ &&
- 	    wpa_s->manual_scan_use_id && wpa_s->own_scan_running) {
+ 	    wpa_s->manual_scan_use_id && wpa_s->own_scan_running &&
+ 	    own_request && !(data && data->scan_info.external_scan)) {
 -		wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS "id=%u",
 +		wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS "id=%u",
  			     wpa_s->manual_scan_id);
diff --git a/slackware64-current/source/n/ytalk/ytalk.SlackBuild b/slackware64-current/source/n/ytalk/ytalk.SlackBuild
index c50917e36..201664680 100755
--- a/slackware64-current/source/n/ytalk/ytalk.SlackBuild
+++ b/slackware64-current/source/n/ytalk/ytalk.SlackBuild
@@ -21,12 +21,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-3.3.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # 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 ) ;;
@@ -35,8 +35,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -67,7 +67,7 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --with-x=no \
-  $ARCH-slackware-linux
+  $ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/x/x11/configure/xf86-video-intel b/slackware64-current/source/x/x11/configure/xf86-video-intel
index ea202a7ef..88581a1e7 100644
--- a/slackware64-current/source/x/x11/configure/xf86-video-intel
+++ b/slackware64-current/source/x/x11/configure/xf86-video-intel
@@ -17,4 +17,5 @@ CXXFLAGS="$ALTCFLAGS" \
   --disable-static \
   --enable-kms-only \
   --enable-uxa \
+  --with-default-dri=3 \
   --build=$ARCH-slackware-linux
diff --git a/slackware64-current/source/x/xterm/xterm.SlackBuild b/slackware64-current/source/x/xterm/xterm.SlackBuild
index cc992591f..5750cb484 100755
--- a/slackware64-current/source/x/xterm/xterm.SlackBuild
+++ b/slackware64-current/source/x/xterm/xterm.SlackBuild
@@ -91,7 +91,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-icon-theme=hicolor \
   --with-icondir=/usr/share/icons \
   --with-pixmapdir=/usr/share/pixmaps \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/slackware64-current/source/xap/MPlayer/MPlayer.SlackBuild b/slackware64-current/source/xap/MPlayer/MPlayer.SlackBuild
index 7a9cfbe1d..7630c802c 100755
--- a/slackware64-current/source/xap/MPlayer/MPlayer.SlackBuild
+++ b/slackware64-current/source/xap/MPlayer/MPlayer.SlackBuild
@@ -102,8 +102,8 @@
 PRGNAM=MPlayer
 VERSION=${VERSION:-20160125}
 BRANCH=${BRANCH:-1.2}        # leave empty if you want to build MPlayer trunk
-FFMPEG=${FFMPEG:-2.8.6}
-BUILD=${BUILD:-3}
+FFMPEG=${FFMPEG:-2.8.10}
+BUILD=${BUILD:-4}
 TAG=${TAG:-}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/slackware64-current/source/xap/ddd/ddd.SlackBuild b/slackware64-current/source/xap/ddd/ddd.SlackBuild
index 5bd702099..f3440019b 100755
--- a/slackware64-current/source/xap/ddd/ddd.SlackBuild
+++ b/slackware64-current/source/xap/ddd/ddd.SlackBuild
@@ -27,7 +27,7 @@
 
 PKGNAM=ddd
 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
@@ -44,13 +44,7 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -94,7 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib$LIBDIRSUFFIX \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make -j $NUMJOBS || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/xap/fvwm/fvwm.SlackBuild b/slackware64-current/source/xap/fvwm/fvwm.SlackBuild
index ddd373d93..0867f1a24 100755
--- a/slackware64-current/source/xap/fvwm/fvwm.SlackBuild
+++ b/slackware64-current/source/xap/fvwm/fvwm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2011, 2012, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012, 2015, 2016, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -76,8 +76,6 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-bidi \
-  --disable-gtk \
   --program-prefix= \
   --program-suffix= \
   --build=$ARCH-slackware-linux || exit 1
diff --git a/slackware64-current/source/xap/gftp/gftp.SlackBuild b/slackware64-current/source/xap/gftp/gftp.SlackBuild
index c125b39fa..e8835d769 100755
--- a/slackware64-current/source/xap/gftp/gftp.SlackBuild
+++ b/slackware64-current/source/xap/gftp/gftp.SlackBuild
@@ -22,12 +22,12 @@
 
 PKGNAM=gftp
 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
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
@@ -37,8 +37,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -70,7 +70,7 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var/lib \
   --mandir=/usr/man \
   --docdir=/usr/doc/gftp-$VERSION \
-  --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/xap/gnuchess/gnuchess.SlackBuild b/slackware64-current/source/xap/gnuchess/gnuchess.SlackBuild
index a5aed7690..3d1f26401 100755
--- a/slackware64-current/source/xap/gnuchess/gnuchess.SlackBuild
+++ b/slackware64-current/source/xap/gnuchess/gnuchess.SlackBuild
@@ -25,7 +25,7 @@ VERGNUCHESS=6.2.4
 VERSJENG=11.2
 VEREBOARD=1.1.1
 VERXBOARD=4.9.1
-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/imagemagick/imagemagick.SlackBuild b/slackware64-current/source/xap/imagemagick/imagemagick.SlackBuild
index 49797da04..44bc25291 100755
--- a/slackware64-current/source/xap/imagemagick/imagemagick.SlackBuild
+++ b/slackware64-current/source/xap/imagemagick/imagemagick.SlackBuild
@@ -29,7 +29,7 @@ BUILD=${BUILD:-1}
 # This is a bit messy, so we'll explain it well.  :-)
 
 # This is the version number used in the source tarball filename
-FILEVER=6.9.4-9
+FILEVER=6.9.7-3
 
 # This is the base version number, which is needed to cd into the source tree.
 # Normally this is the same as $FILEVER, but allow setting it here if needed.
@@ -109,7 +109,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --program-prefix= \
   --with-x \
   --with-frozenpaths=no \
-  --without-modules \
+  --with-modules \
   --disable-openmp \
   --enable-static=no \
   --enable-shared \
diff --git a/slackware64-current/source/xap/imagemagick/policy.xml.diff.gz b/slackware64-current/source/xap/imagemagick/policy.xml.diff.gz
index 2f1c9fbf1..03bfb4cdd 100644
--- a/slackware64-current/source/xap/imagemagick/policy.xml.diff.gz
+++ b/slackware64-current/source/xap/imagemagick/policy.xml.diff.gz
@@ -1 +1 @@
-be035fd9c2316b5192c2b9151058ec33316fc751
+edb70150853e05616253068feac9080ec1a858c6
diff --git a/slackware64-current/source/xap/pidgin/pidgin.SlackBuild b/slackware64-current/source/xap/pidgin/pidgin.SlackBuild
index c035bd3a3..106bfc734 100755
--- a/slackware64-current/source/xap/pidgin/pidgin.SlackBuild
+++ b/slackware64-current/source/xap/pidgin/pidgin.SlackBuild
@@ -24,7 +24,7 @@
 PKGNAM=pidgin
 VERSION=${VERSION:-$(echo $PKGNAM-2.*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 PIDGINENC=${PIDGINENC:-3.1}
-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/xine-lib/xine-lib.SlackBuild b/slackware64-current/source/xap/xine-lib/xine-lib.SlackBuild
index bc3e5eb7d..09514c8d6 100755
--- a/slackware64-current/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/slackware64-current/source/xap/xine-lib/xine-lib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
 # Copyright 2015  Heinz Wiesinger, Amsterdam, NL
 # All rights reserved.
@@ -33,7 +33,7 @@ PKGVER=1.2.6
 # Version used for statically linked ffmpeg
 FFMPEG_VERSION=${FFMPEG_VERSION:-$(echo ../MPlayer/ffmpeg-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
 
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -111,7 +111,7 @@ cd ffmpeg* || exit 1
     --enable-bzlib \
     --enable-zlib \
     --enable-libopenjpeg \
-    ${FFARCHOPTS}
+    ${FFARCHOPTS} || exit 1
 
     make $NUMJOBS V=1 || exit 1
     make install # Note: no DESTDIR !!
@@ -144,7 +144,8 @@ XINE_BUILD=$TARGET \
   --disable-nosefart \
   --disable-vcd \
   --without-speex \
-  --with-external-dvdnav
+  --without-xcb \
+  --with-external-dvdnav || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/slackware64-current/source/xap/xine-ui/xine-ui.SlackBuild b/slackware64-current/source/xap/xine-ui/xine-ui.SlackBuild
index 2cef59a52..a1b5171d4 100755
--- a/slackware64-current/source/xap/xine-ui/xine-ui.SlackBuild
+++ b/slackware64-current/source/xap/xine-ui/xine-ui.SlackBuild
@@ -22,9 +22,9 @@
 
 
 VERSION=${VERSION:-$(echo xine-ui-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-# I would use "-march=i486 -mcpu=i686" here as usual, but with XINE it's all or nothing.
+# I would use "-march=i586 -mcpu=i686" here as usual, but with XINE it's all or nothing.
 # I'd rather have it work well for the i686/Athlon crowd than suck for everyone.
-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/xlockmore/slack-desc b/slackware64-current/source/xap/xlockmore/slack-desc
index 92ee2c419..441cefd8e 100644
--- a/slackware64-current/source/xap/xlockmore/slack-desc
+++ b/slackware64-current/source/xap/xlockmore/slack-desc
@@ -15,5 +15,5 @@ xlockmore: The 'Bob' bitmap has been included especially for Slackware, as well
 xlockmore: as a Linux penguin logo.  (NOTE: the image of J. R. "Bob" Dobbs is a
 xlockmore: registered trademark of The Subgenius Foundation, used by permission)
 xlockmore:
-xlockmore:
+xlockmore: Homepage:  http://sillycycle.com/xlockmore.html
 xlockmore:
diff --git a/slackware64-current/source/xap/xlockmore/xlockmore.SlackBuild b/slackware64-current/source/xap/xlockmore/xlockmore.SlackBuild
index 3516c567e..0909dbb83 100755
--- a/slackware64-current/source/xap/xlockmore/xlockmore.SlackBuild
+++ b/slackware64-current/source/xap/xlockmore/xlockmore.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2011, 2012, 2013, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2017  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,15 +28,15 @@ 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"
@@ -93,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --without-motif \
   --without-esound \
   --without-gtk \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 cd xlock
-- 
cgit v1.2.3-70-g09d2