games/cgames: Fix build.

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

1 files changed, 20 insertions, 16 deletions

diff --git a/games/cgames/cgames.SlackBuild b/games/cgames/cgames.SlackBuild
index 43ec8393ec..9fdb59635a 100644
--- a/games/cgames/cgames.SlackBuild
+++ b/games/cgames/cgames.SlackBuild
@@ -22,11 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220405 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix the build so the games can find their own data dir at runtime.
+# - binary in /usr/games, data in /usr/share/games/$PRGNAM
+# - fix permissions.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cgames
 VERSION=${VERSION:-2.2b}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +43,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
@@ -75,9 +77,9 @@ 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 \
+  -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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -91,18 +93,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-ncurses \
   --build=$ARCH-slackware-linux
 
-make DESTDIR=$PKG datadir=$PKG/usr/share/csokoban mandir="$PKG/usr/man/" \
-    bindir="$PKG/usr/bin" csokoban-install
-make DESTDIR=$PKG datadir=$PKG/usr/share/cmines mandir="$PKG/usr/man/" \
-    bindir="$PKG/usr/bin" cmines-install
-make DESTDIR=$PKG datadir=$PKG/usr/share/cblocks mandir="$PKG/usr/man/" \
-    bindir="$PKG/usr/bin" cblocks-install
+runmake() {
+  make datadir=/usr/share/games/csokoban mandir=/usr/man/ \
+       bindir=/usr/games $1-build
+  make DESDTIR=$PKG datadir=$PKG/usr/share/games/csokoban mandir=$PKG/usr/man/ \
+       bindir=$PKG/usr/games $1-install
+}
 
-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
+runmake csokoban
+runmake cmines
+runmake cblocks
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+strip $PKG/usr/games/*
+chmod 644 $PKG/usr/man/man*/* $PKG/usr/share/games/csokoban/*
+gzip $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING Changelog README $PKG/usr/doc/$PRGNAM-$VERSION