1 files changed, 42 insertions, 13 deletions
diff --git a/development/Catch/Catch.SlackBuild b/development/Catch/Catch.SlackBuild
index 7e24bff1fc..029b3fc649 100644
--- a/development/Catch/Catch.SlackBuild
+++ b/development/Catch/Catch.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Catch
 
+# Copyright 2023 Steven Voges <Oregon, USA>
 # Copyright 2017 Andre Barboza, Belo Horizonte - Brazil
 # All rights reserved.
 #
@@ -22,10 +23,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220421 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - move docs to correct Slackware doc dir.
+# - make the self-tests optional.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Catch
-VERSION=${VERSION:-1.10.0}
+VERSION=${VERSION:-2.13.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
@@ -59,26 +71,43 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf ${PRGNAM}2-$VERSION
+tar xvf $CWD/${PRGNAM}2-$VERSION.tar.gz
+cd ${PRGNAM}2-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+wanttest=OFF
+[ "${SELFTEST:-no}" = "yes" ] && wanttest=ON
 
-mkdir -p $PKG/usr/include/Catch
-cp -rvf include/* $PKG/usr/include/Catch
-cp -vf single_include/catch.hpp $PKG/usr/include
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCATCH_USE_VALGRIND=OFF \
+    -DCATCH_BUILD_EXAMPLES=OFF \
+    -DCATCH_ENABLE_COVERAGE=OFF \
+    -DCATCH_ENABLE_WERROR=OFF \
+    -DBUILD_TESTING=$wanttest \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -raf LICENSE.txt README.md docs/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md LICENSE.txt docs/ $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mv $PKG/usr/share/doc/Catch2 $PKG/usr/doc/$PRGNAM-$VERSION &>/dev/null || true
+rm -rf $PKG/usr/share/doc
+
 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