4 files changed, 40 insertions, 28 deletions
diff --git a/multimedia/vkeybd/README b/multimedia/vkeybd/README
index f5d4a8cbf1..d995e0173c 100644
--- a/multimedia/vkeybd/README
+++ b/multimedia/vkeybd/README
@@ -1,8 +1,10 @@
-vkeybd is a virtual keyboard for AWE/OSS, MIDI/OSS and ALSA drivers.  It is 
-a simple fake of a MIDI keyboard on X-windows system. Enjoy music with your 
+vkeybd (virtual piano keyboard)
+
+vkeybd is a virtual keyboard for AWE/OSS, MIDI/OSS and ALSA drivers. It is
+a simple fake of a MIDI keyboard on X-window system. Enjoy music with your
 mouse and computer keyboard.
 
-Make sure to have a MIDI synth configured in order to play music with this 
+Make sure to have a MIDI synth configured in order to play music with this
 program - if you use the optional dependency TiMidity++, for example, run
 it in ALSA server mode (timidity -iA) before starting vkeybd, then use
 aconnect to link the ALSA sequencer input (vkeybd) and output (timidity)
diff --git a/multimedia/vkeybd/slack-desc b/multimedia/vkeybd/slack-desc
index fd0c944003..f4d03ecc83 100644
--- a/multimedia/vkeybd/slack-desc
+++ b/multimedia/vkeybd/slack-desc
@@ -6,10 +6,10 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-vkeybd: vkeybd (virtual keyboard)
+vkeybd: vkeybd (virtual piano keyboard)
 vkeybd:
 vkeybd: vkeybd is a virtual keyboard for AWE/OSS, MIDI/OSS and ALSA drivers.
-vkeybd: It's a simple fake of a MIDI keyboard on X-windows system. Enjoy a
+vkeybd: It's a simple fake of a MIDI keyboard on X-window system. Enjoy
 vkeybd: music with your mouse and computer keyboard :-)
 vkeybd:
 vkeybd:
diff --git a/multimedia/vkeybd/vkeybd.SlackBuild b/multimedia/vkeybd/vkeybd.SlackBuild
index 409db3eb64..663056859c 100644
--- a/multimedia/vkeybd/vkeybd.SlackBuild
+++ b/multimedia/vkeybd/vkeybd.SlackBuild
@@ -2,12 +2,24 @@
 
 # Slackware build script for vkeybd
 
-# Written by Luis Henrique <lmello.009@gmail.com>
+# Written by Luis Henrique <email removed>
 
 # Thanks to the Ubuntu community for some tips on the vkeybd keymap settings!
 # Check https://help.ubuntu.com/community/HowToVirtualKeyboardKeymapping for
 # more information.
 
+# 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.
+
+# 20180103 bkw:
+# - take over maintenance.
+# - i486 => i586.
+# - determine tcl version from system, instead of hardcoding.
+# - simplify script a bit.
+# - fix grammer in README and slack-desc.
+# - 'virtual keyboard' => 'virtual piano keyboard' in slack-desc.
+
 PRGNAM=vkeybd
 VERSION=${VERSION:-0.1.18d}
 BUILD=${BUILD:-3}
@@ -15,7 +27,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
@@ -26,8 +38,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"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -40,34 +52,32 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM\-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM
 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 {} \+
+
+# make .desktop file validate
+sed -i -e '/^Encoding/d' -e '/^Cat/s,Application;,,' $PRGNAM.desktop
+
+# grab tcl version from the system
+TCLVER="$( basename $( readlink /usr/bin/tclsh|sed 's,tclsh,,' ) )"
 
 make \
   COPTFLAGS="$SLKCFLAGS" \
   PREFIX=/usr \
   MAN_DIR=/usr/man \
-  TCL_VERSION=8.6
-make \
-  PREFIX=/usr \
-  MAN_DIR=/usr/man \
-  TCL_VERSION=8.6 \
-  install-all \
-  DESTDIR=$PKG
-
-( cd $PKG/usr/share/pixmaps ; ln -s vkeybd_48x48.png vkeybd.png )
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  TCL_VERSION=$TCLVER \
+  DESTDIR=$PKG \
+  all install-all
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man?/*.?
+strip $PKG/usr/bin/*
+ln -s ${PRGNAM}_48x48.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/multimedia/vkeybd/vkeybd.info b/multimedia/vkeybd/vkeybd.info
index 2e77bd7bc5..19b2a20529 100644
--- a/multimedia/vkeybd/vkeybd.info
+++ b/multimedia/vkeybd/vkeybd.info
@@ -6,5 +6,5 @@ MD5SUM="5c7bd16e2903866f949879b885953a2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Luis Henrique"
-EMAIL="lmello.009@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"