3 files changed, 21 insertions, 32 deletions
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index f77271809..56365a9cb 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=bind
-VERSION=${VERSION:-9.14.5}
+VERSION=${VERSION:-9.14.6}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -67,11 +67,6 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-# Remove use of SO_BSDCOMPAT which has been obsolete since the 2.2.x kernel
-# series, and generates warnings under 2.6.x kernels.  This _might_ be fixed
-# upstream already, but an explicit #undef SO_BSDCOMPAT does not hurt:
-zcat $CWD/bind.so_bsdcompat.diff.gz | patch -p1 --verbose || exit
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -92,7 +87,6 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --enable-shared \
   --disable-static \
-  --enable-threads \
   --with-openssl=/usr \
   --build=$ARCH-slackware-linux || exit 1
 
diff --git a/source/n/bind/bind.so_bsdcompat.diff b/source/n/bind/bind.so_bsdcompat.diff
deleted file mode 100644
index 5d78031b7..000000000
--- a/source/n/bind/bind.so_bsdcompat.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/isc/unix/socket.c.orig	2005-11-03 17:08:42.000000000 -0600
-+++ ./lib/isc/unix/socket.c	2006-02-18 13:09:15.000000000 -0600
-@@ -245,6 +245,8 @@
- 
- #define SOCK_DEAD(s)			((s)->references == 0)
- 
-+#undef SO_BSDCOMPAT
-+
- static void
- manager_log(isc_socketmgr_t *sockmgr,
- 	    isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/source/n/sshfs/sshfs.SlackBuild b/source/n/sshfs/sshfs.SlackBuild
index 8f4aae010..78a5b9f1d 100755
--- a/source/n/sshfs/sshfs.SlackBuild
+++ b/source/n/sshfs/sshfs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sshfs
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -76,21 +76,27 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
   --mandir=/usr/man \
-  --bindir=/bin \
-  --sbindir=/sbin \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --build=${ARCH}-slackware-linux \
-  || exit 1
-
-make $NUMJOBS || make || exit 1
-
-make install DESTDIR=$PKG || exit 1
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --buildtype=release \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null