6 files changed, 47 insertions, 24 deletions
diff --git a/development/tkcvs/README b/development/tkcvs/README
index ee79e3a903af..9b43dca58003 100644
--- a/development/tkcvs/README
+++ b/development/tkcvs/README
@@ -4,6 +4,3 @@ the files in the current working directory, and provides buttons and
 menus to execute configuration-management commands on the selected
 files. Limited RCS functionality is also present. TkDiff is bundled
 in for browsing and merging your changes.
-
-Just to be clearly stated: it requires tcl,tk
-
diff --git a/development/tkcvs/doinst.sh b/development/tkcvs/doinst.sh
index 37f8fcb21843..0f4a153ca0c6 100644
--- a/development/tkcvs/doinst.sh
+++ b/development/tkcvs/doinst.sh
@@ -1,3 +1,3 @@
 if [ -x usr/bin/update-desktop-database ]; then
-    ./usr/bin/update-desktop-database ./usr/share/applications > /dev/null 2>&1
+    usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
 fi
diff --git a/development/tkcvs/slack-desc b/development/tkcvs/slack-desc
index 056d990da967..78ad96949705 100644
--- a/development/tkcvs/slack-desc
+++ b/development/tkcvs/slack-desc
@@ -1,4 +1,12 @@
-tkcvs: tkcvs (a Tcl/Tk Graphical Interface to CVS and Subversion)
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+tkcvs: tkcvs (Tcl/Tk Graphical Interface to CVS and Subversion)
 tkcvs: 
 tkcvs: TkCVS is a Tcl/Tk-based graphical interface to the CVS and
 tkcvs: Subversion configuration management systems. It displays the status of
diff --git a/development/tkcvs/tkcvs.SlackBuild b/development/tkcvs/tkcvs.SlackBuild
index 01cec5673105..d4d46270d973 100644
--- a/development/tkcvs/tkcvs.SlackBuild
+++ b/development/tkcvs/tkcvs.SlackBuild
@@ -1,41 +1,63 @@
 #!/bin/sh
 
 # Slackware build script for tkcvs
-# Written by Ferenc Deak <ferenc.deak@gmail.com>
+
+# Copyright 2007-2008 Ferenc Deak <ferenc.deak@gmail.com>
+# 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.
 
 # Slightly modified by the SlackBuilds project
-set -e
 
 PRGNAM=tkcvs
-VERSION=8.0.3
+VERSION=8.1
 ARCH=${ARCH:-noarch}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+SRCVERSION=$(echo $VERSION | tr . _)
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-V=${VERSION//./_}
-rm -rf ${PRGNAM}_$V
-tar xzf $CWD/${PRGNAM}_$V.tar.gz
-cd ${PRGNAM}_$V
+rm -rf ${PRGNAM}_$SRCVERSION
+tar xzf $CWD/${PRGNAM}_$SRCVERSION.tar.gz
+cd ${PRGNAM}_$SRCVERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 ./doinstall.tcl -nox $PKG/usr
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
@@ -45,10 +67,9 @@ chmod -R u+w,go+r-w,a-s .
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a FAQ COPYING CHANGELOG \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cp tkdiff/Changelog $PKG/usr/doc/$PRGNAM-$VERSION/tkdiff-Changelog
-cp tkdiff/COPYING $PKG/usr/doc/$PRGNAM-$VERSION/tkdiff-COPYING
+cp -a FAQ COPYING CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION
+cp tkdiff/Changelog $PKG/usr/doc/$PRGNAM-$VERSION/Changelog.tkdiff
+cp tkdiff/COPYING $PKG/usr/doc/$PRGNAM-$VERSION/COPYING.tkdiff
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/share/applications
@@ -60,5 +81,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
-
diff --git a/development/tkcvs/tkcvs.desktop b/development/tkcvs/tkcvs.desktop
index 3b6efc9b258a..17f1bc911bc5 100644
--- a/development/tkcvs/tkcvs.desktop
+++ b/development/tkcvs/tkcvs.desktop
@@ -8,4 +8,3 @@ Type=Application
 Categories=Application;Development
 StartupNotify=false
 Encoding=UTF-8
-
diff --git a/development/tkcvs/tkcvs.info b/development/tkcvs/tkcvs.info
index 93edc930c5ac..5ad86a29b039 100644
--- a/development/tkcvs/tkcvs.info
+++ b/development/tkcvs/tkcvs.info
@@ -1,8 +1,8 @@
 PRGNAM="tkcvs"
-VERSION="8.0.3"
+VERSION="8.1"
 HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
-DOWNLOAD="http://www.twobarleycorns.net/tkcvs_8_0_3.tar.gz"
-MD5SUM="f02a40b84ac7c8de7f24acbcac066207"
+DOWNLOAD="http://www.twobarleycorns.net/tkcvs_8_1.tar.gz"
+MD5SUM="9beafa7be8af0b8736f48636b329fcb3"
 MAINTAINER="Ferenc Deak"
 EMAIL="ferenc.deak@gmail.com"
-APPROVED="BP{k}"
+APPROVED="David Somero"