[pkgsrc/trunk]: pkgsrc/devel/tkdiff update to 3.09

[recht <recht%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/feac7d7e4f98
branches:  trunk
changeset: 468741:feac7d7e4f98
user:      recht <recht%pkgsrc.org@localhost>
date:      Mon Feb 16 16:34:02 2004 +0000

description:
update to 3.09
take maintainership
ok'd by sakamoto@

3.09 changes (5/24/2001):
* Removed use of the user name in temp file path. This removed a problem
  on Windows when the user name had a space in it.
* Made diff "edge detection" smarter by using the new smarter overlap code
  for cases where diff decided to treat whitespace slightly different
  on missing-EOL files when doing 3-way diffs.
* Added the "..." back to the Save options in the merge result window
  when appropriate.

3.08 changes (1/15/2001):
* Made overlap detection smarter

3.07 changes (12/17/2000):
* Highlight overlaps in bright yellow during 3-way merge
* Added "Exit" and "Save & Exit" buttons to merge preview window
* Removed error that popped up when doing a merge that was
  not necessary.

3.06 changes (unreleased):
* Minor changes for AccuRev integration

diffstat:

 devel/tkdiff/Makefile |  20 ++++++++------------
 devel/tkdiff/distinfo |   6 +++---
 2 files changed, 11 insertions(+), 15 deletions(-)

diffs (50 lines):

diff -r b67210cd5a55 -r feac7d7e4f98 devel/tkdiff/Makefile
--- a/devel/tkdiff/Makefile     Mon Feb 16 16:26:22 2004 +0000
+++ b/devel/tkdiff/Makefile     Mon Feb 16 16:34:02 2004 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:34:10 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/16 16:34:02 recht Exp $
 #
 
-DISTNAME=      tkdiff-3.05.tcl.txt
-PKGNAME=       tkdiff-3.05
+DISTNAME=      tkdiff_3_09
+PKGNAME=       tkdiff-3.09
 CATEGORIES=    devel
-MASTER_SITES=  ftp://ftp.accurev.com/pub/free/tkdiff/
-EXTRACT_SUFX=  # Nothing
+MASTER_SITES=  http://www.accurev.com/ftp/free/tkdiff/
+EXTRACT_SUFX=  .zip
 
-MAINTAINER=    sakamoto%NetBSD.org@localhost
+MAINTAINER=    recht%NetBSD.org@localhost
 HOMEPAGE=      http://www.accurev.com/free/tkdiff/
 COMMENT=       Graphical 2-way diff/merge tool
 
@@ -15,13 +15,9 @@
 
 NO_BUILD=      yes
 NO_CONFIGURE=  yes
-CMDNAME=       tkdiff3
-
-EXTRACT_CMD=   ${CAT} ${DISTDIR}/${DISTNAME} |                         \
-               ${SED} -e 's|^exec wish |exec wish |' |         \
-               ${TR} -d '\015' > ${WRKDIR}/${CMDNAME}
+NO_BUILDLINK=  yes
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKDIR}/${CMDNAME} ${LOCALBASE}/bin/${CMDNAME}
+       ${INSTALL_SCRIPT} ${WRKDIR}/tkdiff.tcl ${LOCALBASE}/bin/tkdiff3
 
 .include "../../mk/bsd.pkg.mk"
diff -r b67210cd5a55 -r feac7d7e4f98 devel/tkdiff/distinfo
--- a/devel/tkdiff/distinfo     Mon Feb 16 16:26:22 2004 +0000
+++ b/devel/tkdiff/distinfo     Mon Feb 16 16:34:02 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/21 00:44:48 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/02/16 16:34:02 recht Exp $
 
-SHA1 (tkdiff-3.05.tcl.txt) = e13fa966b6a10154973e56d5c402444ed2558d57
-Size (tkdiff-3.05.tcl.txt) = 249773 bytes
+SHA1 (tkdiff_3_09.zip) = 5c30883b81c7ad4b413d7b218b76271635efd76a
+Size (tkdiff_3_09.zip) = 63247 bytes