4 files changed, 22 insertions, 22 deletions
diff --git a/multimedia/mkvalidator/README b/multimedia/mkvalidator/README
index 32a80f3553..ea2be1a309 100644
--- a/multimedia/mkvalidator/README
+++ b/multimedia/mkvalidator/README
@@ -1,6 +1,6 @@
 mkvalidator (tool to verify Matroska and WebM files)
 
 mkvalidator is a simple command line tool to verify Matroska and WebM
-files  for  spec  conformance. It checks the various bogus or missing
+files for spec conformance. It checks the various bogus or missing
 key elements against the EBML DocType version of the file and reports
 the errors/warnings in the command line.
diff --git a/multimedia/mkvalidator/mkvalidator.SlackBuild b/multimedia/mkvalidator/mkvalidator.SlackBuild
index 712767cc79..3e383af8a2 100644
--- a/multimedia/mkvalidator/mkvalidator.SlackBuild
+++ b/multimedia/mkvalidator/mkvalidator.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mkvalidator
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,13 +42,16 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  BITS=""
+  _target="gcc_linux"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  BITS=""
+  _target="gcc_linux"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  BITS="_x64"
+  _target="gcc_linux_x64"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2"
+  _target="gcc_linux_arm"
 else
   SLKCFLAGS="-O2"
 fi
@@ -69,26 +72,23 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-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
+sed "s|/usr/local|$PKG/usr|g" -i corec/tools/coremake/gcc_mak.inc
+sed 's|arm-linux-gnueabi-||g' -i corec/tools/coremake/gcc_linux_arm.build
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+gcc $SLKCFLAGS -o coremake corec/tools/coremake/coremake.c
+./coremake ${_target}
 
+cd $PRGNAM
 make
 
 install -d $PKG/usr/bin
-install -D -m755 release/gcc_linux${BITS}/mkvalidator $PKG/usr/bin/mkvalidator
-install -D -m755 release/gcc_linux${BITS}/mkvtree $PKG/usr/bin/mkvtree
+make install
+
+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 ChangeLog.txt ReadMe.txt $PKG/usr/doc/$PRGNAM-$VERSION/
+cp ../ChangeLog.txt ../ReadMe.txt $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/mkvalidator/mkvalidator.info b/multimedia/mkvalidator/mkvalidator.info
index 0db8339577..6ff094fe06 100644
--- a/multimedia/mkvalidator/mkvalidator.info
+++ b/multimedia/mkvalidator/mkvalidator.info
@@ -1,8 +1,8 @@
 PRGNAM="mkvalidator"
-VERSION="0.5.1"
+VERSION="0.5.2"
 HOMEPAGE="https://www.matroska.org/downloads/mkvalidator.html"
-DOWNLOAD="https://sourceforge.net/projects/matroska/files/mkvalidator/mkvalidator-0.5.1.tar.bz2"
-MD5SUM="950a3a733f32909567d3a2aa1c935bbc"
+DOWNLOAD="https://sourceforge.net/projects/matroska/files/mkvalidator/mkvalidator-0.5.2.tar.bz2"
+MD5SUM="37e995f8d87ba73b91da2899c4c57f5a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/mkvalidator/slack-desc b/multimedia/mkvalidator/slack-desc
index 9357de33bb..f2ca25917c 100644
--- a/multimedia/mkvalidator/slack-desc
+++ b/multimedia/mkvalidator/slack-desc
@@ -9,7 +9,7 @@
 mkvalidator: mkvalidator (Verify Matroska and WebM files)
 mkvalidator:
 mkvalidator: mkvalidator is a simple command line tool to verify Matroska and WebM
-mkvalidator: files  for  spec  conformance. It checks the various bogus or missing
+mkvalidator: files for spec conformance. It checks the various bogus or missing
 mkvalidator: key elements against the EBML DocType version of the file and reports
 mkvalidator: the errors/warnings in the command line.
 mkvalidator: