1 files changed, 28 insertions, 14 deletions
diff --git a/games/arnold-cpc/arnold-cpc.SlackBuild b/games/arnold-cpc/arnold-cpc.SlackBuild
index bfd41ac3a1..1b72bb0e4e 100644
--- a/games/arnold-cpc/arnold-cpc.SlackBuild
+++ b/games/arnold-cpc/arnold-cpc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for arnold-cpc
 
@@ -22,13 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220407 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - don't install an extra copy of the binary in /usr/doc.
+
+# 20220219 bkw: Modified by SlackBuilds.org:
+# - fix 15.0 build.
+# - absolute path to icon in .desktop file (because it's not in /usr/share/icons).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=arnold-cpc
+VERSION=${VERSION:-2009.03.17}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCVER=$(echo $VERSION | tr . -)
 SRCDIR=$(echo $PRGNAM | cut -c1-6)
 SRCNAM=${SRCDIR}-nurgle
-SRCVER=${SRCVER:-2009-03-17}
-VERSION=$(echo $SRCVER | tr - .)
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +49,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}
@@ -68,12 +83,14 @@ cd $SRCDIR
 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 {} \+
 
 cd src
 
+SLKCFLAGS+=" -fcommon"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -88,14 +105,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make  # compile source
 # no make install support here
 
-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
-
 cd ..
 
 # install executable
 mkdir -p $PKG/usr/bin
-install -D -m0755 $SRCDIR $PKG/usr/bin/$SRCDIR
+install -s -D -m0755 $SRCDIR $PKG/usr/bin/$SRCDIR
 
 # install .desktop file created for this script
 mkdir -p $PKG/usr/share/applications
@@ -107,7 +121,7 @@ mkdir -p $PKG/usr/share/pixmaps/
 install -D -m644 ${PRGNAM}-0.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a  README.FIRST arnold* readme* whatsnew* docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.FIRST arnold{-,_}* readme* whatsnew* docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -115,4 +129,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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