system/tinyvm: Updated for version 20170212, new maintainer.

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

3 files changed, 34 insertions, 23 deletions

diff --git a/system/tinyvm/README b/system/tinyvm/README
index adfd0276364b..5ba4f604b70f 100644
--- a/system/tinyvm/README
+++ b/system/tinyvm/README
@@ -9,5 +9,9 @@ There are some included example programs that will be installed to:
 
   /usr/doc/tinyvm-$VERSION/programs/
 
-
 The main executable is `tvmi`.
+
+TinyVM does NOT implement a "real" architecture such as x86 or arm. In
+other words, it's not a replacement for qemu or virtualbox. The VM
+implemented here is loosely based on the x86 architecture, but highly
+simplified.
diff --git a/system/tinyvm/tinyvm.SlackBuild b/system/tinyvm/tinyvm.SlackBuild
index 6d8e4382635e..eaa776bce819 100644
--- a/system/tinyvm/tinyvm.SlackBuild
+++ b/system/tinyvm/tinyvm.SlackBuild
@@ -1,6 +1,11 @@
 #!/bin/sh
+
 # Slackware build script for tinyvm
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+
+# Originally written by:
+# Ryan P.C. McQuen | Everett, WA | (email removed)
+
+# Now maintained by B. Watson (yalhcru@gmail.com)
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,15 +25,21 @@
 # with this program (most likely, a file named COPYING).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+# 20170308 bkw:
+# - take over maintenance
+# - update to 20170212 (latest git commit)
+# - i486 => i586
+# - add some clarification to README
+
 PRGNAM=tinyvm
-VERSION=${VERSION:-20150221}
-SRCVERSION=a4c540f5a00fd188dc014ba13d1c36c7e7abf3ba
+VERSION=${VERSION:-20170212}
+SRCVER=${SRCVER:-a652f7219f3378450ccdb05154832558bdf5f22d}
 BUILD=${BUILD:-1}
 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
@@ -39,8 +50,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"
@@ -57,9 +68,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$SRCVERSION.tar.gz || tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 
 ## default compiler (clang)
 make OPTS="$SLKCFLAGS"
@@ -73,15 +84,11 @@ make OPTS="$SLKCFLAGS"
 ## pcc
 #make CC=pcc PEDANTIC=no OPTIMIZATION="-O2 -fPIC -xinline"
 
-mkdir -p $PKG/usr/{bin,include}
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-
-cp -arv bin/* $PKG/usr/bin/
-cp -arv include/* $PKG/usr/include/
-cp -arv lib/* $PKG/usr/lib${LIBDIRSUFFIX}/
+mkdir -p $PKG/usr/bin $PKG/usr/include $PKG/usr/lib${LIBDIRSUFFIX}
 
-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
+install -m0755 -s bin/* $PKG/usr/bin/
+install -m0644 include/* $PKG/usr/include/
+install -m0644 lib/* $PKG/usr/lib${LIBDIRSUFFIX}/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION/README-SBo
diff --git a/system/tinyvm/tinyvm.info b/system/tinyvm/tinyvm.info
index 06a3e9dc4e7b..b36c0976c0a4 100644
--- a/system/tinyvm/tinyvm.info
+++ b/system/tinyvm/tinyvm.info
@@ -1,10 +1,10 @@
 PRGNAM="tinyvm"
-VERSION="20150221"
+VERSION="20170212"
 HOMEPAGE="https://github.com/jakogut/tinyvm"
-DOWNLOAD="https://github.com/jakogut/tinyvm/archive/a4c540f5a00fd188dc014ba13d1c36c7e7abf3ba.tar.gz"
-MD5SUM="77c5eb0f08bf8c17c415f45cc6a4c52a"
+DOWNLOAD="https://github.com/jakogut/tinyvm/archive/a652f7219f3378450ccdb05154832558bdf5f22d/tinyvm-a652f7219f3378450ccdb05154832558bdf5f22d.tar.gz"
+MD5SUM="e8d48db43f9e1c5f27b9c0ac20a682d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"