audio/minimodem: Updated for v0.24+20210717_bb2f34c, new maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

5 files changed, 57 insertions, 31 deletions

diff --git a/audio/minimodem/20210717_bb2f34c.diff.gz b/audio/minimodem/20210717_bb2f34c.diff.gz
new file mode 100644
index 0000000000..d44eaa39d3
--- /dev/null
+++ b/audio/minimodem/20210717_bb2f34c.diff.gz
diff --git a/audio/minimodem/README b/audio/minimodem/README
index 0c3d45a0fb..163ab83f8d 100644
--- a/audio/minimodem/README
+++ b/audio/minimodem/README
@@ -1,3 +1,5 @@
+minimodem (software audio FSK modem)
+
 Minimodem is a command-line program which decodes (or generates)
 audio modem tones at any specified baud rate, using various framing
 protocols. It acts a general-purpose software FSK modem, and includes
@@ -10,3 +12,7 @@ system audio device, or in batched mode via audio files.
 Minimodem can be used to transfer data between nearby computers using
 an audio cable (or just via sound waves), or between remote computers
 using radio, telephone, or another audio communications medium.
+
+Optional dependency: sndio (autodetected). If this is installed,
+minimodem will be built with support for it. If you have sndio install
+but want to build without it, export SNDIO=no in the environment.
diff --git a/audio/minimodem/minimodem.SlackBuild b/audio/minimodem/minimodem.SlackBuild
index 423e670eba..d78b36deda 100644
--- a/audio/minimodem/minimodem.SlackBuild
+++ b/audio/minimodem/minimodem.SlackBuild
@@ -2,7 +2,8 @@
 
 # SlackBuild script for minimodem
 
-# Copyright 2014 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014 Benjamin Trigona-Harany <email removed>
+# Copyright 2024 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,11 +25,20 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified and now maintained by B. Watson.
+
+# 20240404 bkw:
+# - take over maintenance.
+# - update for v0.24+20210717_bb2f34c.
+# - don't install ChangeLog, it's empty.
+# - fix minor man page formatting issue.
+# - add optional sndio dependency.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=minimodem
-VERSION=${VERSION:-0.24}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.24+20210717_bb2f34c}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -40,9 +50,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
@@ -54,55 +61,68 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
 
+SRCVER="$(   echo $VERSION | cut -d+ -f1 )"
+PATCHVER="$( echo $VERSION | cut -d+ -f2 )"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 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 {} +
+
+# 20240404 bkw: allow building with sndio. it compiles, but hasn't
+# been run-tested by the SlackBuild maintainer. configure script
+# doesn't autodetect; --without-sndio really is required if sndio
+# isn't installed.
+if pkg-config --exists sndio && [ "${SNDIO:-yes}" = "yes" ]; then
+  WITH="with"
+else
+  WITH="without"
+fi
+
+# 20240403 bkw: use upstream's latest git (which is ~3 years old now).
+# This patch came from 'git diff 0.24', but I had to manually edit the
+# diff to remove the patches for files named debian/*.
+zcat $CWD/$PATCHVER.diff | patch -p1
+
+# 20240404 bkw: I AM THE GREAT CORNHOLIO! I need .TP for my man page!
+sed -i.bak '/limit max-conf/s,^,.TP\n,' src/$PRGNAM.1.in
+
+autoreconf -if
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --$WITH-sndio \
   --with-pulseaudio=yes
 
 make
-make install DESTDIR=$PKG
-
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
+# 20240403 bkw: ChangeLog is a 0-byte placeholder.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING README THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README THANKS $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
+sed "s,@WITH@,$WITH," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/minimodem/minimodem.info b/audio/minimodem/minimodem.info
index a122c22a25..f571e2a1b2 100644
--- a/audio/minimodem/minimodem.info
+++ b/audio/minimodem/minimodem.info
@@ -1,10 +1,10 @@
 PRGNAM="minimodem"
-VERSION="0.24"
+VERSION="0.24+20210717_bb2f34c"
 HOMEPAGE="http://www.whence.com/minimodem/"
 DOWNLOAD="http://www.whence.com/minimodem/minimodem-0.24.tar.gz"
 MD5SUM="35c9aa66ca16fafb5d8327fe46999140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/audio/minimodem/slack-desc b/audio/minimodem/slack-desc
index 6ec5a8078e..1dae4aaf74 100644
--- a/audio/minimodem/slack-desc
+++ b/audio/minimodem/slack-desc
@@ -14,6 +14,6 @@ minimodem: protocols. It acts a general-purpose software FSK modem, and includes
 minimodem: support for various standard FSK protocols such as Bell103, Bell202,
 minimodem: RTTY, NOAA SAME, and Caller-ID.
 minimodem:
-minimodem:
+minimodem: This package was built @WITH@ sndio support.
 minimodem:
 minimodem: