6 files changed, 44 insertions, 14 deletions
diff --git a/audio/eawpats/README b/audio/eawpats/README
index 0fecfa8091..2c184bc66e 100644
--- a/audio/eawpats/README
+++ b/audio/eawpats/README
@@ -1,14 +1,16 @@
-eawpats is a sound patches library for TiMidity++.  This package
-contains a patchset for the TiMidity++ MIDI player.  A patchset is
-required for MIDI files to be audible through TiMidity++.  These
+eawpats (MIDI instrument patches)
+
+eawpats is a sound patches library for TiMidity++. This package
+contains a patchset for the TiMidity++ MIDI player. A patchset is
+required for MIDI files to be audible through TiMidity++. These
 patches also work with applications that use SDL_mixer for MIDI audio.
 
-Note that eawpats contains proprietary sound samples.  According to the
+Note that eawpats contains proprietary sound samples. According to the
 ALSA Wiki:
 
 "Half of the patches in eawpats are derived from original Gravis
 patches, and therefore may have some intellectual property issues."
 
 If this is a concern to you, use freepats instead (however,
-eawpats does sound nicer).  For more information, see
+eawpats does sound nicer). For more information, see
 /usr/doc/eawpats-12/copyrigh.txt
diff --git a/audio/eawpats/doinst.sh b/audio/eawpats/doinst.sh
index 0a9be04c39..674945c896 100644
--- a/audio/eawpats/doinst.sh
+++ b/audio/eawpats/doinst.sh
@@ -17,3 +17,8 @@ config etc/timidity/eawpats.cfg.new
 if [ ! -r etc/timidity/timidity.cfg ]; then
   ( cd etc/timidity ; ln -sf eawpats.cfg timidity.cfg )
 fi
+
+# SDL 1.2's SDL_mixer still uses the obsolete location for timidity.cfg:
+if [ ! -r etc/timidity.cfg ]; then
+  ( cd etc ; ln -sf timidity/eawpats.cfg timidity.cfg )
+fi
diff --git a/audio/eawpats/douninst.sh b/audio/eawpats/douninst.sh
new file mode 100644
index 0000000000..b5df94f31c
--- /dev/null
+++ b/audio/eawpats/douninst.sh
@@ -0,0 +1,9 @@
+# remove symlinks, if they belong to us.
+
+[ -e etc/timidity.cfg ] && \
+  [ "$( readlink etc/timidity.cfg )" == "timidity/eawpats.cfg" ] && \
+  rm -f etc/timidity.cfg
+
+[ -e etc/timidity/timidity.cfg ] && \
+  [ "$( readlink etc/timidity/timidity.cfg )" == "eawpats.cfg" ] && \
+  rm -f etc/timidity/timidity.cfg
diff --git a/audio/eawpats/eawpats.SlackBuild b/audio/eawpats/eawpats.SlackBuild
index b2529dfde6..295d67e7b6 100644
--- a/audio/eawpats/eawpats.SlackBuild
+++ b/audio/eawpats/eawpats.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for eawpats
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -11,6 +11,12 @@
 # This is the original author's site, but it's more polite to download
 # from the gentoo mirror (see .info file)
 
+# 20230111 bkw: BUILD=4, symlink eawpats.cfg to /etc/timidity.cfg (the
+# "old" location), since SDL 1.2's SDL_mixer still uses it. Makes the
+# music work in odamex (and probably various other games). Also add
+# a douninst.sh that will remove the symlinks if they still point
+# to eawpats.cfg.
+
 # 20191201 bkw: symlink eawpats.cfg to timidity.cfg in doinst.sh,
 # if there's no timidity.cfg already. This makes things Just Work(tm).
 
@@ -23,14 +29,21 @@
 # I only ever noticed this because allegro's pat2dat chokes on
 # missing patches.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=eawpats
 VERSION=${VERSION:-12}
 SRCVER=${VERSION}_full
 ARCH=noarch
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,6 +83,7 @@ mv * $PKG/usr/share/sounds/$PRGNAM
 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/audio/eawpats/eawpats.info b/audio/eawpats/eawpats.info
index 06d652a0d9..2a60537fcc 100644
--- a/audio/eawpats/eawpats.info
+++ b/audio/eawpats/eawpats.info
@@ -1,10 +1,10 @@
 PRGNAM="eawpats"
 VERSION="12"
-HOMEPAGE="http://slackwiki.com/Timidity%2B%2B"
-DOWNLOAD="http://distfiles.gentoo.org/distfiles/eawpats12_full.tar.gz"
+HOMEPAGE="https://slackwiki.com/Timidity%2B%2B"
+DOWNLOAD="https://distfiles.gentoo.org/distfiles/85/eawpats12_full.tar.gz"
 MD5SUM="8ebcf0583f3077346ebace93c8ea166f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/audio/eawpats/slack-desc b/audio/eawpats/slack-desc
index 14d494be60..ff962b362e 100644
--- a/audio/eawpats/slack-desc
+++ b/audio/eawpats/slack-desc
@@ -10,7 +10,7 @@ eawpats: eawpats (MIDI instrument patches)
 eawpats:
 eawpats: This package contains a patchset for the TiMidity++ MIDI player.
 eawpats: A patchset is required for MIDI files to be audible through
-eawpats: TiMidity++.  These patches also work with applications that use
+eawpats: TiMidity++. These patches also work with applications that use
 eawpats: SDL_mixer for MIDI audio.
 eawpats:
 eawpats: