development/tktable: Updated for version 2.10.7.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

3 files changed, 20 insertions, 22 deletions

diff --git a/development/tktable/slack-desc b/development/tktable/slack-desc
index 615e04316e..3fadb04b03 100644
--- a/development/tktable/slack-desc
+++ b/development/tktable/slack-desc
@@ -16,4 +16,4 @@ tktable: to change visual appearance, in-cell editing - returns value back to
 tktable: data source, support for disabled (read-only) tables or cells,
 tktable: multiple selection modes, with "active" cell, multiple drawing modes,
 tktable: optional 'flashes' when things update and cell validation support.
-tktable: For more info visit http://tktable.sourceforge.net
+tktable: For more info visit https://github.com/wjoye/tktable
diff --git a/development/tktable/tktable.SlackBuild b/development/tktable/tktable.SlackBuild
index 00887e0912..22fc558931 100644
--- a/development/tktable/tktable.SlackBuild
+++ b/development/tktable/tktable.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tktable
-VERSION=${VERSION:-2.10}
+VERSION=${VERSION:-2.10.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -67,8 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/Tktable$VERSION.tar.gz
-mv Tktable$VERSION $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -86,7 +85,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --disable-static \
   --build=$ARCH-slackware-linux \
   --enable-threads \
   $WITH_64BIT_SUPPORT
@@ -94,16 +92,16 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# Remove unnessesary directory created during install
+# fix naming issue to retain backward compatibility
+sed -i '4s/tktable/Tktable/' $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}2.10/pkgIndex.tcl
+
+# Remove unnessesary directories created during install
 rmdir $PKG/usr/bin
+rmdir $PKG/usr/include
 
-# By default, man pages are not installed. Correct this
-mkdir -p $PKG/usr/man/mann
-cp doc/tkTable.n $PKG/usr/man/mann/tktable.n
-chmod 0644 $PKG/usr/man/mann/tktable.n
+# rename man page
+( cd $PKG/usr/man/mann/; mv tkTable.n tktable.n )
 
-# Include demos
-cp -r demos $PKG/usr/lib${LIBDIRSUFFIX}/Tktable${VERSION}/demos
 
 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
@@ -111,14 +109,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
+chmod 0664 demos/*
+chmod 0664 release.txt ChangeLog README.txt
+gzip -9 ChangeLog
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  README.blt README.txt TODO.txt license.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-
-# move html documentation and other files to an appropriate location
-mv $PKG/usr/lib${LIBDIRSUFFIX}/Tktable${VERSION}/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/lib${LIBDIRSUFFIX}/Tktable${VERSION}/html  $PKG/usr/doc/$PRGNAM-$VERSION
+   README.md README.blt README.txt TODO.txt license.txt \
+   release.txt ChangeLog.gz demos \
+   $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/tktable/tktable.info b/development/tktable/tktable.info
index 9c524ecd31..0565cce84a 100644
--- a/development/tktable/tktable.info
+++ b/development/tktable/tktable.info
@@ -1,8 +1,8 @@
 PRGNAM="tktable"
-VERSION="2.10"
-HOMEPAGE="http://tktable.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/project/tktable/tktable/2.10/Tktable2.10.tar.gz"
-MD5SUM="ecdd96b39ad49b820bf084eb1c786f66"
+VERSION="2.10.7"
+HOMEPAGE="https://github.com/wjoye/tktable"
+DOWNLOAD="https://github.com/wjoye/tktable/archive/v2.10.7/tktable-2.10.7.tar.gz"
+MD5SUM="ce3bf2409e8c4a0e7d9fab367daea69c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""