7 files changed, 69 insertions, 36 deletions
diff --git a/libraries/allegro4/README b/libraries/allegro4/README
index e7c062bd94..c5269dfcb4 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 27a3b21428..d237453a3c 100644
--- a/libraries/allegro4/allegro4.SlackBuild
+++ b/libraries/allegro4/allegro4.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for allegro
 #
@@ -24,17 +24,31 @@
 
 # Updated by Peter Wang
 
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# 20230627 bkw: BUILD=4
+# - fix doinst.sh, add douninst.sh to handle /usr/info/dir.
+# - minor nitpick: midi => MIDI in README and slack-desc.
+
+# 20220402 bkw: BUILD=3
+# - install docs in correct dir (PRGNAM, not SRCNAM).
+
+# 20211019 bkw: BUILD=2
+# - make eawpats a hard dep.
+# - reflow README.
 
 # 20180108 bkw:
 # - Take over maintenance.
 # - i486 => i586.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=allegro4
 SRCNAM=allegro
-VERSION=${VERSION:-4.4.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.4.3.1}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -44,7 +58,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}
@@ -72,13 +90,11 @@ 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
 
 mkdir -p build
 cd build
@@ -89,12 +105,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
@@ -110,13 +123,13 @@ if [ -e /usr/share/sounds/eawpats/default.cfg ]; then
 		$PKG/usr/share/$SRCNAM/patches.dat
 fi
 
-mkdir -p $PKG/usr/doc/$SRCNAM-$VERSION
-cp -a readme.txt todo.txt AUTHORS CHANGES THANKS $PKG/usr/doc/$SRCNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$SRCNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/usr/doc/$SRCNAM-* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.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
diff --git a/libraries/allegro4/allegro4.info b/libraries/allegro4/allegro4.info
index ebe3d3df24..c590c1645a 100644
--- a/libraries/allegro4/allegro4.info
+++ b/libraries/allegro4/allegro4.info
@@ -1,10 +1,10 @@
 PRGNAM="allegro4"
-VERSION="4.4.2"
+VERSION="4.4.3.1"
 HOMEPAGE="https://www.allegro.cc/"
-DOWNLOAD="https://downloads.sourceforge.net/alleg/allegro-4.4.2.tar.gz"
-MD5SUM="4db71b0460fc99926ae91d223199c2e6"
+DOWNLOAD="https://github.com/liballeg/allegro5/releases/download/4.4.3.1/allegro-4.4.3.1.tar.gz"
+MD5SUM="d0435da87d4c157ad3620e1cc58b807e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="eawpats"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/libraries/allegro4/doinst.sh b/libraries/allegro4/doinst.sh
index 5e444b85f3..9ee3f5d3d9 100644
--- a/libraries/allegro4/doinst.sh
+++ b/libraries/allegro4/doinst.sh
@@ -1,14 +1,18 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
 config etc/allegro.cfg.new
+
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/libraries/allegro4/douninst.sh b/libraries/allegro4/douninst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/libraries/allegro4/douninst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/libraries/allegro4/slack-desc b/libraries/allegro4/slack-desc
index 811f43af8d..3fe5e9e887 100644
--- a/libraries/allegro4/slack-desc
+++ b/libraries/allegro4/slack-desc
@@ -9,7 +9,7 @@
 allegro4: allegro4 (game programming library)
 allegro4:
 allegro4: The Allegro library provides C/C++ programmers low level routines
-allegro4: commonly needed in game programing, such as input, graphics, midi,
+allegro4: commonly needed in game programing, such as input, graphics, MIDI,
 allegro4: sound effects, and timing.
 allegro4:
 allegro4: http://www.allegro.cc/
diff --git a/libraries/allegro4/texinfo-6.7.patch b/libraries/allegro4/texinfo-6.7.patch
new file mode 100644
index 0000000000..23f3dc83d9
--- /dev/null
+++ b/libraries/allegro4/texinfo-6.7.patch
@@ -0,0 +1,10 @@
+--- a/docs/src/allegro._tx	2020-12-24 17:20:47.460212662 -0600
++++ a/docs/src/allegro._tx	2020-12-24 17:22:03.453620793 -0600
+@@ -23,6 +23,7 @@
+ @man_shortdesc_force1=allegro
+ @man_shortdesc_force2=Allegro game programming library.
+ @$\input texinfo
++@$@documentencoding ISO-8859-1
+ @$@setfilename allegro.inf
+ @$@settitle Allegro Manual
+ @$@setchapternewpage odd