3 files changed, 26 insertions, 19 deletions
diff --git a/system/mktorrent/mktorrent.SlackBuild b/system/mktorrent/mktorrent.SlackBuild
index 706386adb3dca..eae38b74a998e 100644
--- a/system/mktorrent/mktorrent.SlackBuild
+++ b/system/mktorrent/mktorrent.SlackBuild
@@ -4,18 +4,25 @@
 # Written by Grigorios Bouzakis (grbzks@xsmail.com)
 
 PRGNAM=mktorrent
-VERSION=${VERSION:-0.9.9}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 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"
@@ -30,26 +37,26 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
 make CFLAGS+="-w $SLKCFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFS64"
 mkdir -p $PKG/usr/bin
 cat mktorrent > $PKG/usr/bin/mktorrent
 chmod 0755 $PKG/usr/bin/mktorrent
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/mktorrent/mktorrent.info b/system/mktorrent/mktorrent.info
index 41ca1c7d01352..1bc0efc0aa34f 100644
--- a/system/mktorrent/mktorrent.info
+++ b/system/mktorrent/mktorrent.info
@@ -1,8 +1,8 @@
 PRGNAM="mktorrent"
-VERSION="0.9.9"
-HOMEPAGE="http://borg.uu3.net/~borg/?mktorrent"
-DOWNLOAD="ftp://borg.uu3.net/pub/unix/mktorrent/mktorrent-0.9.9.tgz"
-MD5SUM="8bdfa36982446f3ccd8549fedefb7448"
+VERSION="1.1"
+HOMEPAGE="https://github.com/Rudde/mktorrent/"
+DOWNLOAD="https://github.com/Rudde/mktorrent/archive/v1.1/mktorrent-1.1.tar.gz"
+MD5SUM="0f583dc6d88c3bc7da736c3f0a8c449e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mktorrent/slack-desc b/system/mktorrent/slack-desc
index f95bc9221fc02..b49b8d3614913 100644
--- a/system/mktorrent/slack-desc
+++ b/system/mktorrent/slack-desc
@@ -10,7 +10,7 @@ mktorrent: mktorrent (Console .torrent file creator)
 mktorrent:
 mktorrent: Console .torrent file creator. It support Multi Trackers.
 mktorrent:
-mktorrent: Homepage: http://borg.uu3.net/~borg/?mktorrent
+mktorrent: Homepage: https://github.com/Rudde/mktorrent
 mktorrent:
 mktorrent:
 mktorrent: