libraries/allegro4: Make eawpats a hard dep.

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

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

3 files changed, 18 insertions, 23 deletions

diff --git a/libraries/allegro4/README b/libraries/allegro4/README
index e7c062bd94..106dd778a3 100644
--- a/libraries/allegro4/README
+++ b/libraries/allegro4/README
@@ -1,8 +1,12 @@
-The Allegro library provides C/C++ programmers low level routines commonly
-needed in game programming, such as input, graphics, midi, sound effects, and
-timing. It is cross platform and works with many different compilers.
-Originally developed by Shawn Hargreaves, it is now a group project with
-contributions from all over the world! Some of its key features include:
+allegro4 (game programming library)
+
+The Allegro library provides C/C++ programmers low level routines
+commonly needed in game programming, such as input, graphics, midi,
+sound effects, and timing. It is cross platform and works with many
+different compilers. Originally developed by Shawn Hargreaves, it is
+now a group project with contributions from all over the world! Some
+of its key features include:
+
     * Ease of Use - comes with comprehensive documentation and examples
     * Extensibility - if the built-in functionality isn't enough, there
       are many add-ons available
@@ -12,7 +16,3 @@ contributions from all over the world! Some of its key features include:
     * Open Source - anyone can contribute, including you!
     * Free - it won't cost you a dime, and there are no restrictions on
       its usage
-
-Allegro 4 can make use of sound patches like 'eawpats' for MIDI playback.
-If 'eawpats' is installed first then this SlackBuild will create a
-patches.dat from it.
diff --git a/libraries/allegro4/allegro4.SlackBuild b/libraries/allegro4/allegro4.SlackBuild
index 978a851884..a7584d7a5a 100644
--- a/libraries/allegro4/allegro4.SlackBuild
+++ b/libraries/allegro4/allegro4.SlackBuild
@@ -26,6 +26,10 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20211019 bkw: BUILD=2
+# - make eawpats a hard dep.
+# - reflow README.
+
 # 20180108 bkw:
 # - Take over maintenance.
 # - i486 => i586.
@@ -35,7 +39,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=allegro4
 SRCNAM=allegro
 VERSION=${VERSION:-4.4.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -47,9 +51,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
@@ -82,11 +83,8 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$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 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 patch -p1 < $CWD/build-dir.diff
 patch -p1 < $CWD/texinfo-6.7.patch
@@ -100,12 +98,9 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-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
-
 mkdir -p $PKG/usr/share/allegro
 cp language.dat keyboard.dat $PKG/usr/share/allegro
 mkdir -p $PKG/etc
diff --git a/libraries/allegro4/allegro4.info b/libraries/allegro4/allegro4.info
index cdb82cbe35..07ecb47842 100644
--- a/libraries/allegro4/allegro4.info
+++ b/libraries/allegro4/allegro4.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/liballeg/allegro5/releases/download/4.4.3.1/allegro
 MD5SUM="d0435da87d4c157ad3620e1cc58b807e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="eawpats"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"