1 files changed, 26 insertions, 10 deletions
diff --git a/games/redeclipse/redeclipse.SlackBuild b/games/redeclipse/redeclipse.SlackBuild
index 9fc132f829..c4f99a397e 100644
--- a/games/redeclipse/redeclipse.SlackBuild
+++ b/games/redeclipse/redeclipse.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Red Eclipse
 
-# Copyright 2017 Jeremy Hansen  <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2020 Jeremy Hansen  <jebrhansen+SBo -at- gmail.com>
 # Copyright 2015 Erik Falor USA
 # All rights reserved.
 #
@@ -23,11 +23,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220505 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - move example server config to Slackware doc dir, remove /usr/share/doc.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=redeclipse
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-2.0.0}
 SRCNAM=base
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +43,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}
@@ -70,8 +80,8 @@ for SUBMODULE in `cat $CWD/submodules-list`; do
   if [ -d data/$SUBMODULE ]; then
     rm -r data/$SUBMODULE
   fi
-  tar xvf $CWD/${SUBMODULE}-${VERSION}.tar.gz
-  mv ${SUBMODULE}-${VERSION} data/${SUBMODULE}
+  tar xvf $CWD/${SUBMODULE}-*.tar.gz
+  mv ${SUBMODULE}-* data/${SUBMODULE}
   if [ -e data/${SUBMODULE}/.gitmodules ]; then
     rm data/${SUBMODULE}/.gitmodules
   fi
@@ -80,9 +90,13 @@ done
 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 {} \+
+
+# Try and fix issue with cube2font not installing properly
+# https://github.com/redeclipse/base/issues/988
+sed -i 's/m755 cube2font/&_linux/' src/system-install.mk
 
 export CXXFLAGS="$SLKCFLAGS"
 make -C src/ client server cube2font
@@ -101,6 +115,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM/examples $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Copy slack-desc and doinst.sh into ./install
@@ -109,4 +125,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