audio/mac: Updated for version 3.99_u4_b5_s7, new maintainer.

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

4 files changed, 44 insertions, 47 deletions

diff --git a/audio/mac/README b/audio/mac/README
index e4c34898c2..a8f2f96ea5 100644
--- a/audio/mac/README
+++ b/audio/mac/README
@@ -2,3 +2,6 @@ mac (Monkey's Audio Linux port)
 
 mac is a console frontend to Monkey's Audio, able to encode and 
 decode ape audio files.
+
+If you're building this for an old x86 CPU that doesn't support MMX,
+set ASM=no in the script's environment.
diff --git a/audio/mac/gcc4_errors.patch b/audio/mac/gcc4_errors.patch
deleted file mode 100644
index 8e4bdab847..0000000000
--- a/audio/mac/gcc4_errors.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/MACLib/APELink.cpp	2006-06-01 13:00:57.000000000 +0400
-+++ src/MACLib/APELink.cpp	2009-06-15 00:31:36.081731282 +0400
-@@ -63,10 +63,10 @@
-     if (pData != NULL)
-     {
-         // parse out the information
--        char * pHeader = strstr(pData, APE_LINK_HEADER);
--        char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
--        char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
--        char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
-+        const char * pHeader = strstr(pData, APE_LINK_HEADER);
-+        const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
-+        const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
-+        const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
- 
-         if (pHeader && pImageFile && pStartBlock && pFinishBlock)
-         {
-@@ -81,7 +81,7 @@
-                 
-                 // get the path
-                 char cImageFile[MAX_PATH + 1]; int nIndex = 0;
--                char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
-+                const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
-                 while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
-                     cImageFile[nIndex++] = *pImageCharacter++;
-                 cImageFile[nIndex] = 0;
diff --git a/audio/mac/mac.SlackBuild b/audio/mac/mac.SlackBuild
index 644f31dcc5..d6a2912baf 100644
--- a/audio/mac/mac.SlackBuild
+++ b/audio/mac/mac.SlackBuild
@@ -2,11 +2,25 @@
 
 # Slackware build script for mac
 
-# Written by Luis Henrique <lmello.009@gmail.com>
+# Originally written by Luis Henrique <email removed>
+
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# Original version of this script had no license. Modified version
+# licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
+# for details.
+
+# 20180105 bkw:
+# - take over maintenance
+# - update for 3.99_u4_b5_s7 (BUILD=1)
+# - add ASM environment variable
+# - don't install INSTALL in doc dir
+# - get rid of .la file
+# - minor script simplification
 
 PRGNAM=mac
-VERSION=${VERSION:-3.99}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.99_u4_b5_s7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -22,35 +36,44 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# If we're on x86 or x86_64, with MMX support, there's optimized
+# assembly code we can use. If ARCH is unknown, or if ASM=no in
+# the environment, disable it.
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+  ASM=${ASM:-yes}
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  ASM=${ASM:-yes}
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  ASM=${ASM:-yes}
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  ASM=${ASM:-no}
 fi
 
 set -e
 
+SRCVER=${VERSION//_/-}
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-u4-b5
-tar xvf $CWD/$PRGNAM-$VERSION-u4-b5.tar.gz
-cd $PRGNAM-$VERSION-u4-b5
+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 \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
+LDFLAGS="-Wl,-s" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -58,20 +81,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-shared=yes \
   --enable-static=no \
-  --enable-assembly=yes \
+  --enable-assembly=$ASM \
   --build=$ARCH-slackware-linux
 
-# Patch to fix gcc4 output errors:
-patch -p0 < $CWD/gcc4_errors.patch
-
-make
+make all
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# pretty sure we don't need this:
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.la
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/mac/mac.info b/audio/mac/mac.info
index 7e21a2e6b4..59f8cd3055 100644
--- a/audio/mac/mac.info
+++ b/audio/mac/mac.info
@@ -1,10 +1,10 @@
 PRGNAM="mac"
-VERSION="3.99"
+VERSION="3.99_u4_b5_s7"
 HOMEPAGE="https://web.archive.org/web/20120529111247/http://supermmx.org/linux/mac"
-DOWNLOAD="http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5/mac-3.99-u4-b5.tar.gz"
-MD5SUM="75716b342e07deae58f56a2522362006"
+DOWNLOAD="http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5-s7/mac-3.99-u4-b5-s7.tar.gz"
+MD5SUM="74df3c96476636387ddd12255b03bebe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Luis Henrique"
-EMAIL="lmello.009@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"