development/frobtads: Updated for version 2.0.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 23 insertions, 28 deletions

diff --git a/development/frobtads/frobtads.SlackBuild b/development/frobtads/frobtads.SlackBuild
index 51cddce0a1..0691aa1313 100644
--- a/development/frobtads/frobtads.SlackBuild
+++ b/development/frobtads/frobtads.SlackBuild
@@ -15,7 +15,7 @@
 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}
@@ -28,9 +28,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -66,31 +63,29 @@ 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 -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
diff --git a/development/frobtads/frobtads.info b/development/frobtads/frobtads.info
index c9351e215f..ed761dc9ba 100644
--- a/development/frobtads/frobtads.info
+++ b/development/frobtads/frobtads.info
@@ -1,8 +1,8 @@
 PRGNAM="frobtads"
-VERSION="1.2.4"
+VERSION="2.0"
 HOMEPAGE="https://www.tads.org/frobtads.htm"
-DOWNLOAD="https://github.com/realnc/frobtads/releases/download/1.2.4/frobtads-1.2.4.tar.bz2"
-MD5SUM="d4a5b8863664998fb989f3fdd2f63de6"
+DOWNLOAD="https://github.com/realnc/frobtads/releases/download/v2.0/frobtads-2.0.tar.bz2"
+MD5SUM="5188944620298695508b9b41a2dba49c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""