Update tkcvs to 7.2.

Changes since 7.1.2:

- More merging functionality.  Helps you tag the merged-from and merged-to
  versions, and if you use the tagnames properly, draws curving arrows between
  them to show where merges occurred.  The tagnames are configurable with the
  cvscfg(mergetoformat) and cvscfg(mergefromformat) variables.
- Requires Tk 8.4 for the curved lines.
- Fixed bug in annotation browser wherein it didn't change colors when
  "Days per Color" changed.
- No longer pops an error dialog if the background exec fails.  Just beeps at
  you.  The command's output should tell you what happened.
- TkDiff v4.0:
      "r" key binding to recompute diffs
      fix for diff symbols in Change Bars disappearing
      preferences for showing whitespace differences
      better tolerance of Windows filenames
- Bugfix for hangs in 7.1.3
- Bugfix for uninitialized X1 coordinate
- Compatible with CVS 1.11.8, which lost the global -l flag.
- Mainline tkdiff is back.  Tkdiff is on Sourceforge now and there's an
  official beta, which is pretty stable.
- Annotation browsing is available from the log branch browser.  There's also
  a button on the main window to make it more likely that people will discover
  the function, which can be most useful.
- Merging will work to the branch as well as to the trunk in the logcanvas
  browser.
- Solved a few problems with the exec functionality.  High CPU usage is gone.
  It now gives back the UI (to one degree or another) and captures
  stderr (both) instead of doing one or the other.
- Made a filter for single-line module-diff (patch) output.  Now files that
  were added, removed, or changed are easier to pick out visually.
- Added an Apply button to the module-level checkout, export, and patch
  dialogs.  Since they don't save state, you could have to type the same
  thing over and over on subsequent operations.

3 files changed, 12 insertions, 9 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index e3f9a1506d5..d95e74cf68e 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/03/09 22:41:21 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2004/03/09 22:49:48 minskim Exp $
 #
 
-DISTNAME=	tkcvs_7_1_2
-PKGNAME=	tkcvs-7.1.2
+DISTNAME=	tkcvs_7_2
+PKGNAME=	tkcvs-7.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.twobarleycorns.net/ \
 		${MASTER_SITE_SOURCEFORGE:=tkcvs/}
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.twobarleycorns.net/tkcvs.html
 COMMENT=	Tcl/Tk frontends to CVS and diff
 
-DEPENDS+=	tk>=8.3:../../x11/tk
+DEPENDS+=	tk>=8.4:../../x11/tk
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/devel/tkcvs/PLIST b/devel/tkcvs/PLIST
index 6f8f3642dd6..8f25c177bba 100644
--- a/devel/tkcvs/PLIST
+++ b/devel/tkcvs/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/22 14:59:25 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/09 22:49:48 minskim Exp $
 bin/tkcvs
-bin/tkdiffb
+bin/tkdiff
 man/man1/tkcvs.1
 share/doc/tkcvs/README.tkcvs
 share/tkcvs/bitmaps/add.gif
 share/tkcvs/bitmaps/adir.gif
 share/tkcvs/bitmaps/amod.gif
+share/tkcvs/bitmaps/annotate.gif
+share/tkcvs/bitmaps/annotate.xbm
 share/tkcvs/bitmaps/arrow.gif
 share/tkcvs/bitmaps/arrow_dn.gif
 share/tkcvs/bitmaps/arrow_hl_dn.gif
@@ -51,6 +53,7 @@ share/tkcvs/bitmaps/paper.gif
 share/tkcvs/bitmaps/patches.gif
 share/tkcvs/bitmaps/patchfile.gif
 share/tkcvs/bitmaps/rcsdir.gif
+share/tkcvs/bitmaps/rdiff.gif
 share/tkcvs/bitmaps/refresh.gif
 share/tkcvs/bitmaps/remove.gif
 share/tkcvs/bitmaps/stat_conf.gif
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 8fcd8ea0c70..ee56b3d8974 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2002/12/23 13:13:29 tron Exp $
+$NetBSD: distinfo,v 1.9 2004/03/09 22:49:48 minskim Exp $
 
-SHA1 (tkcvs_7_1_2.tar.gz) = 01342ef43bb6d04bb1daa9b760510ccc60e8ba6a
-Size (tkcvs_7_1_2.tar.gz) = 239874 bytes
+SHA1 (tkcvs_7_2.tar.gz) = 1f2f2e745545ed42fd677bafd4682103e7f86bc4
+Size (tkcvs_7_2.tar.gz) = 279525 bytes
 SHA1 (patch-aa) = a9d50bce32e84d9b7e23244957430fca57a765cd