From f20084b46e665c00e9c530fded32577fa22b9994 Mon Sep 17 00:00:00 2001
From: Duncan Roe <duncan_roe@optusnet.com.au>
Date: Sun, 17 Jun 2018 14:38:28 +0100
Subject: development/tkdiff: Updated for version 4.3.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 development/tkdiff/README            |  3 +++
 development/tkdiff/slack-desc        |  4 ++--
 development/tkdiff/tkdiff.SlackBuild | 17 +++++++++++------
 development/tkdiff/tkdiff.info       |  6 +++---
 4 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'development/tkdiff')

diff --git a/development/tkdiff/README b/development/tkdiff/README
index 3c21a521bab6..e23f07e6838c 100644
--- a/development/tkdiff/README
+++ b/development/tkdiff/README
@@ -7,3 +7,6 @@ map of differences for quick navigation.
 
 tkdiff knows about AccuRev, BitKeeper, ClearCase, CVS, Git,
 Mercurial, Perforce, PVCS, RCS, SCCS & Subversion.
+The Git functionality requires that you prefix tags &c. with "-r",
+unlike with git-diff.
+The extensive online help is well worth reading.
diff --git a/development/tkdiff/slack-desc b/development/tkdiff/slack-desc
index 729ca9f43cb0..da8f8beeaf4c 100644
--- a/development/tkdiff/slack-desc
+++ b/development/tkdiff/slack-desc
@@ -12,8 +12,8 @@ tkdiff: tkdiff is a graphical front end to the diff program. It provides a
 tkdiff: side-by-side view of the differences between two files, along with
 tkdiff: several innovative features such as diff bookmarks and a graphical
 tkdiff: map of differences for quick navigation.
-tkdiff:
 tkdiff: tkdiff knows about AccuRev, BitKeeper, ClearCase, CVS, Git,
 tkdiff: Mercurial, Perforce, PVCS, RCS, SCCS & Subversion.
-tkdiff:
+tkdiff: The Git functionality requires that you prefix tags &c. with "-r",
+tkdiff: unlike with git-diff. See the extensive online help.
 tkdiff: Home page: https://sourceforge.net/projects/tkdiff/
diff --git a/development/tkdiff/tkdiff.SlackBuild b/development/tkdiff/tkdiff.SlackBuild
index 5dd199ed0d68..cdcb35308eec 100644
--- a/development/tkdiff/tkdiff.SlackBuild
+++ b/development/tkdiff/tkdiff.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tkdiff
 
-# Copyright 2017 Duncan Roe, Melbourne, Australia
+# Copyright 2017,2018 Duncan Roe, Melbourne, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tkdiff
-VERSION=${VERSION:-4.2}
+VERSION=${VERSION:-4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,14 +34,19 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# The next group of variables attempt to enable building 4.2
+TAR=${TAR:-unzip}                  #tar xvf
+SOURCE=${SOURCE:-tkdiff-4-3}       #tkdiff-unix
+TARFILE=${TARFILE:-tkdiff-4-3.zip} #$PRGNAM-$VERSION.tar.gz
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf tkdiff-unix
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd tkdiff-unix
+rm -rf $SOURCE
+$TAR $CWD/$TARFILE
+cd $SOURCE
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -55,7 +60,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.txt LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/tkdiff/tkdiff.info b/development/tkdiff/tkdiff.info
index f1266948794d..4a468830b3a7 100644
--- a/development/tkdiff/tkdiff.info
+++ b/development/tkdiff/tkdiff.info
@@ -1,8 +1,8 @@
 PRGNAM="tkdiff"
-VERSION="4.2"
+VERSION="4.3"
 HOMEPAGE="https://sourceforge.net/projects/tkdiff/"
-DOWNLOAD="https://sourceforge.net/projects/tkdiff/files/tkdiff/4.2/tkdiff-4.2.tar.gz"
-MD5SUM="efc19226416afe3e98e4a29c112cfc3e"
+DOWNLOAD="https://sourceforge.net/projects/tkdiff/files/tkdiff/4.3/tkdiff-4-3.zip"
+MD5SUM="8c807b1f629849f26594de792b7be7e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3