audio/mp3check: Updated download URL, cleanup.

Signed-off-by: Audrius Kažukauskas <audrius@neutrino.lt>

4 files changed, 31 insertions, 13 deletions

diff --git a/audio/mp3check/README b/audio/mp3check/README
index f97cf52bfb..3b56aab786 100644
--- a/audio/mp3check/README
+++ b/audio/mp3check/README
@@ -1,4 +1,4 @@
-mp3check can check MP3 files for consistency and print several errors and
-warnings, list stream attributes (in color).  Layer 1, 2, 3, MPEG1.0+2.0 are
-currently supported.  CRC check for layer 3.  It can process directories
-recursively and also fix certain errors.
+mp3check can check MP3 files for consistency and print several errors
+and warnings, list stream attributes (in color).  Layer 1, 2, 3,
+MPEG1.0+2.0 are currently supported.  CRC check for layer 3.  It can
+process directories recursively and also fix certain errors.
diff --git a/audio/mp3check/mp3check.SlackBuild b/audio/mp3check/mp3check.SlackBuild
index 608abd07fb..c0c56f2135 100644
--- a/audio/mp3check/mp3check.SlackBuild
+++ b/audio/mp3check/mp3check.SlackBuild
@@ -1,7 +1,25 @@
 #!/bin/sh
 
 # Slackware build script for mp3check
-# Written by Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2010-2017 Audrius Kažukauskas <audrius@neutrino.lt>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mp3check
 VERSION=${VERSION:-0.8.7}
@@ -10,7 +28,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -21,8 +39,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -35,7 +53,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -48,7 +66,7 @@ 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Makefile doesn't support DESTDIR.
 sed -i "s|/usr/local/bin|$PKG/usr/bin|" Makefile
diff --git a/audio/mp3check/mp3check.info b/audio/mp3check/mp3check.info
index d6913dcff1..313247d4fc 100644
--- a/audio/mp3check/mp3check.info
+++ b/audio/mp3check/mp3check.info
@@ -1,7 +1,7 @@
 PRGNAM="mp3check"
 VERSION="0.8.7"
-HOMEPAGE="http://code.google.com/p/mp3check/"
-DOWNLOAD="http://mp3check.googlecode.com/files/mp3check-0.8.7.tgz"
+HOMEPAGE="https://code.google.com/archive/p/mp3check/"
+DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp3check/mp3check-0.8.7.tgz"
 MD5SUM="83f5fd6514a55c88126725275aa2d1d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/mp3check/slack-desc b/audio/mp3check/slack-desc
index adca9c7afd..456ae115c4 100644
--- a/audio/mp3check/slack-desc
+++ b/audio/mp3check/slack-desc
@@ -14,6 +14,6 @@ mp3check: Layer 1, 2, 3, and MPEG1.0+2.0 are currently supported.
 mp3check: CRC check for layer 3.  Can process directories recursively.
 mp3check: Can also fix certain errors.
 mp3check:
-mp3check: Homepage:  http://code.google.com/p/mp3check/
+mp3check: Homepage: https://code.google.com/archive/p/mp3check/
 mp3check:
 mp3check: