4 files changed, 13 insertions, 6 deletions
diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild
index 2db9928c..af1cc2eb 100755
--- a/source/n/gnutls/gnutls.SlackBuild
+++ b/source/n/gnutls/gnutls.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gnutls
 VERSION=${VERSION:-$(echo gnutls-*.tar.xz | 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/source/n/s-nail/s-nail.SlackBuild b/source/n/s-nail/s-nail.SlackBuild
index 8102ca8b..3c06152f 100755
--- a/source/n/s-nail/s-nail.SlackBuild
+++ b/source/n/s-nail/s-nail.SlackBuild
@@ -92,7 +92,7 @@ make $NUMJOBS \
   config || exit 1
 
 make $NUMJOBS build || exit 1
-#make $NUMJOBS test || exit 1
+make $NUMJOBS test || exit 1
 make install DESTDIR=$PKG || exit 1
 
 # Tighten up the perms a bit:
diff --git a/source/n/s-nail/s-nail.url b/source/n/s-nail/s-nail.url
index c0bff80e..88f32e6a 100644
--- a/source/n/s-nail/s-nail.url
+++ b/source/n/s-nail/s-nail.url
@@ -1,2 +1,2 @@
-http://ftp.sdaoden.eu/s-nail-14.9.16.tar.xz
-http://ftp.sdaoden.eu/s-nail-14.9.16.tar.xz.asc
+http://ftp.sdaoden.eu/s-nail-14.9.17.tar.xz
+http://ftp.sdaoden.eu/s-nail-14.9.17.tar.xz.asc
diff --git a/source/xap/xsane/xsane.SlackBuild b/source/xap/xsane/xsane.SlackBuild
index b8130201..22264ca1 100755
--- a/source/xap/xsane/xsane.SlackBuild
+++ b/source/xap/xsane/xsane.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2011, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011, 2015, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xsane
 VERSION=0.999
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -51,12 +51,16 @@ PKG=$TMP/package-xsane
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
@@ -114,6 +118,9 @@ cp -a \
 rm -f $PKG/usr/doc/xsane-$VERSION/xsane.spec*
 ( cd $PKG/usr/doc/xsane-$VERSION ; ln -s /usr/share/sane/xsane/doc html )
 
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins ; ln -s /usr/bin/xsane xsane )
+
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man