1 files changed, 22 insertions, 81 deletions
diff --git a/games/trackballs/trackballs.SlackBuild b/games/trackballs/trackballs.SlackBuild
index 810a670593..280d2adc21 100644
--- a/games/trackballs/trackballs.SlackBuild
+++ b/games/trackballs/trackballs.SlackBuild
@@ -6,11 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201024 bkw: update for v1.3.1
 # 20170621 bkw: fix build on -current
 
 PRGNAM=trackballs
-VERSION=${VERSION:-1.1.4}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.3.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -52,43 +53,31 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Apply two patches from redhat: one to fix building and running with guile-2.0.x,
-# another to fix "Esc" behaviour. Also abs.diff, which fixes the build for
-# gcc 7 from -current.
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-# Make icons honor DESTDIR (thanks to Johannes for this fix)
-sed -i 's/ $(iconsdir)/ $(DESTDIR)$(iconsdir)/g' share/icons/Makefile.in
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  cmake \
+    -DTRACKBALLS_BIN_DIR=/usr/games \
+    -DTRACKBALLS_MAN_DIR=/usr/man \
+    -DTRACKBALLS_DOC_DIR=/usr/doc/$PRGNAM-$VERSION \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
 
 gzip $PKG/usr/man/man6/$PRGNAM.6
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a README AUTHORS COPYING ChangeLog FAQ TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a README* AUTHORS* COPYING* FAQ* TODO* NEWS* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-
+# Compatibility icon for old-school window managers.
 mkdir -p $PKG/usr/share/pixmaps
 cat share/icons/$PRGNAM-64x64.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
@@ -96,53 +85,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Include the music, if we find the music tarball
-MUSICFILE=$CWD/$PRGNAM-music-${MUSICVER}.tar.${MUSICEXT}
-if [ -e "$MUSICFILE" ]; then
-  tar xvf "$MUSICFILE"
-  chown root:root $PRGNAM-music/*.ogg
-  chmod 0644 $PRGNAM-music/*.ogg
-  cp -a $PRGNAM-music/*.ogg $PKG/usr/share/$PRGNAM/music
-  cat $PRGNAM-music/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.music
-fi
-
-# Include extra levels, if we find any. This is more complex than it
-# should need to be, but some of the level archives create a top-level
-# directory and some don't...
-levels_included=""
-if [ -e $CWD/levels/ ]; then
-  for file in $CWD/levels/*; do
-    found=0
-    rm -rf tmplevels
-    mkdir -p tmplevels
-
-    case "$file" in
-      *.tar.gz|*.tar.bz2)
-        tar xvfzC "$file" tmplevels
-        found=1
-        ;;
-      *.zip)
-        ( cd tmplevels ; unzip "$file" )
-        found=1
-        ;;
-      *) # break
-        ;;
-    esac
-
-  if [ "$found" = "1" ]; then
-    levels_included="$levels_included\n$( basename $file )"
-    find tmplevels -type f -print0 | xargs -0 chmod 644
-    find tmplevels -type f -print0 | xargs -0 chown root:root
-    find tmplevels -type f -exec cp -a '{}' $PKG/usr/share/$PRGNAM/levels \;
-  fi
-  done
-
-  if [ -n "$levels_included" ]; then
-    echo -e "This package includes the following extra level packs:\n" \
-            "$levels_included" > \
-            $PKG/usr/doc/$PRGNAM-$VERSION/README.extra_levels
-  fi
-fi
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}