1 files changed, 34 insertions, 30 deletions
diff --git a/development/frobtads/frobtads.SlackBuild b/development/frobtads/frobtads.SlackBuild
index d4066290cf..e02d20c584 100644
--- a/development/frobtads/frobtads.SlackBuild
+++ b/development/frobtads/frobtads.SlackBuild
@@ -1,21 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for frobtads
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# Note: the homepage shows 1.2.3 as the latest release, but the github
-# page has 1.2.4, which includes the resource compiler (which seems
-# pretty important).
-
 # TODO: maybe write some man pages.
 
+# 20220318 bkw: fix build on 32-bit. for some reason, 32-bit needs
+# -fpermissive, thought 64-bit does not.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=frobtads
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -25,7 +27,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}
@@ -56,35 +62,33 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# I thought to use --enable-t3debug, but that turns out to be for
-# debugging the tads3 compiler itself, not the tads code it's compiling.
-# Not useful to anyone but upstream... --enable-frobd might be of use
-# to someone, though it requires an external debugger (not included here).
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --enable-frobd \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make V=1
-make install-strip DESTDIR=$PKG
+# upstream hardcoded the share/doc stuff. hate.
+sed -i 's,share/doc,doc,' CMCommon.cmake
+
+# ENABLE_FROBD might be of use to someone, though it requires an
+# external debugger (not included here).
+mkdir -p build
+cd build
+  cmake \
+    -DENABLE_FROBD=ON \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DNDEBUG" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -fpermissive -DNDEBUG" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
 
 DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $DOCDIR
-# don't need these in the pkg:
-rm -f doc/INSTALL doc/MacOSX
-cp -a doc/* $DOCDIR
 ln -s ../../share/$PRGNAM/tads3/doc $DOCDIR/tads3_doc
+ln -s index.htm $DOCDIR/tads3_doc/index.html
 cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$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