3 files changed, 37 insertions, 24 deletions
diff --git a/system/yelp-tools/README b/system/yelp-tools/README
index 92f7d0f688..b7754e9943 100644
--- a/system/yelp-tools/README
+++ b/system/yelp-tools/README
@@ -1 +1,2 @@
-yelp-tools is a set of command-line tools to build and check documentation.
+yelp-tools is a set of command-line tools to build and check
+documentation.
diff --git a/system/yelp-tools/yelp-tools.SlackBuild b/system/yelp-tools/yelp-tools.SlackBuild
index 8acb722736..d7ae9d4d16 100644
--- a/system/yelp-tools/yelp-tools.SlackBuild
+++ b/system/yelp-tools/yelp-tools.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for yelp-tools
 
-# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=yelp-tools
-VERSION=${VERSION:-3.18.0}
+VERSION=${VERSION:-42.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,29 +79,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* NEWS README* MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yelp-tools/yelp-tools.info b/system/yelp-tools/yelp-tools.info
index 25caf333d3..57fc61c9bc 100644
--- a/system/yelp-tools/yelp-tools.info
+++ b/system/yelp-tools/yelp-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="yelp-tools"
-VERSION="3.18.0"
-HOMEPAGE="http://projects.gnome.org/yelp/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
-MD5SUM="ceca436ff2ab3900dde718c0f0286f3f"
+VERSION="42.1"
+HOMEPAGE="https://projects.gnome.org/yelp/"
+DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/yelp-tools/42/yelp-tools-42.1.tar.xz"
+MD5SUM="d106655b3a8f8fc5fa71fbd3c2409cb8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yelp-xsl"