Upgrade tkcvs from version 7.0.3 to version 7.1.2. (Most notable

change, apart from the layout, is that tkdiff is now called tkdiffb).
Summary of changes as follows:

Release 7.1.2
- Fix bugs

Release 7.1.1
- Fix bugs
- Required Tk version is 8.3, not 8.1

Release 7.1
- New functionality, including
- New graphical tool to help with merging directories and seeing an overview
  of the branches.
- New, completely re-written, branching diagram.
- You can invoke the log browser from the command line:
  tkcvs [-dir directory] [-root cvsroot] [-win workdir|module] [-log file]
- Option to use an external editor for commit messages so the rcsinfo template
  feature can be used.
- A picklist keeps a temporary history of directories visited.  Favorite places
  can be bookmarked.
- Capability to browse RCS files, in case you find yourself in an
  rcs-controlled directory.
- A heavily patched TkDiff that works in AquaTK, in case you're a MacOS X fan.
  TkCVS does pretty well in AquaTK as-is, with a few tweaks to tkcvs_def.tcl.
- More intuitive module-operation dialogs contributed by Mike Jagdis.
- Re-arranged buttons.  There's a somewhat overwhelming array, but now almost
  everything is there without resorting to the menus.

4 files changed, 46 insertions, 25 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index f1cc8271c82..ec96518496c 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2002/10/21 14:52:27 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2002/12/22 14:59:25 agc Exp $
 #
 
-DISTNAME=	tkcvs-7_03
-PKGNAME=	tkcvs-7.0.3
+DISTNAME=	tkcvs_7_1_2
+PKGNAME=	tkcvs-7.1.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.twobarleycorns.net/ \
 		${MASTER_SITE_SOURCEFORGE:=tkcvs/}
diff --git a/devel/tkcvs/PLIST b/devel/tkcvs/PLIST
index 3478ba8ede5..6f8f3642dd6 100644
--- a/devel/tkcvs/PLIST
+++ b/devel/tkcvs/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/28 16:55:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/22 14:59:25 agc Exp $
 bin/tkcvs
-bin/tkdiff
+bin/tkdiffb
 man/man1/tkcvs.1
 share/doc/tkcvs/README.tkcvs
 share/tkcvs/bitmaps/add.gif
@@ -13,16 +13,22 @@ share/tkcvs/bitmaps/arrow_hl_up.gif
 share/tkcvs/bitmaps/arrow_up.gif
 share/tkcvs/bitmaps/ball.gif
 share/tkcvs/bitmaps/branch.gif
+share/tkcvs/bitmaps/branch.xbm
 share/tkcvs/bitmaps/branchtag.gif
+share/tkcvs/bitmaps/check.gif
 share/tkcvs/bitmaps/checkin.gif
 share/tkcvs/bitmaps/checkout.gif
-share/tkcvs/bitmaps/clean.gif
-share/tkcvs/bitmaps/clear.gif
+share/tkcvs/bitmaps/checkout_opts.gif
 share/tkcvs/bitmaps/conflict.gif
+share/tkcvs/bitmaps/cvs-says.xbm
 share/tkcvs/bitmaps/cvsdir.gif
 share/tkcvs/bitmaps/delete.gif
 share/tkcvs/bitmaps/diff.gif
 share/tkcvs/bitmaps/dir.gif
+share/tkcvs/bitmaps/dir.xbm
+share/tkcvs/bitmaps/dir_new.gif
+share/tkcvs/bitmaps/dirbranch.gif
+share/tkcvs/bitmaps/dirbranch.xbm
 share/tkcvs/bitmaps/edit.gif
 share/tkcvs/bitmaps/export.gif
 share/tkcvs/bitmaps/fileedit.gif
@@ -30,21 +36,21 @@ share/tkcvs/bitmaps/files.gif
 share/tkcvs/bitmaps/fileview.gif
 share/tkcvs/bitmaps/folder.gif
 share/tkcvs/bitmaps/folderopen.gif
-share/tkcvs/bitmaps/gray75.xbm
 share/tkcvs/bitmaps/import.gif
 share/tkcvs/bitmaps/logfile.gif
 share/tkcvs/bitmaps/loop-glasses.gif
 share/tkcvs/bitmaps/loop-half.gif
 share/tkcvs/bitmaps/loop.gif
+share/tkcvs/bitmaps/man.gif
 share/tkcvs/bitmaps/mdir.gif
-share/tkcvs/bitmaps/mergebranch.gif
-share/tkcvs/bitmaps/mergediff.gif
+share/tkcvs/bitmaps/merge.gif
+share/tkcvs/bitmaps/merge_changes.gif
 share/tkcvs/bitmaps/mod.gif
 share/tkcvs/bitmaps/modbrowse.gif
-share/tkcvs/bitmaps/modules.gif
 share/tkcvs/bitmaps/paper.gif
 share/tkcvs/bitmaps/patches.gif
 share/tkcvs/bitmaps/patchfile.gif
+share/tkcvs/bitmaps/rcsdir.gif
 share/tkcvs/bitmaps/refresh.gif
 share/tkcvs/bitmaps/remove.gif
 share/tkcvs/bitmaps/stat_conf.gif
@@ -54,19 +60,22 @@ share/tkcvs/bitmaps/stat_merge.gif
 share/tkcvs/bitmaps/stat_minus.gif
 share/tkcvs/bitmaps/stat_mod.gif
 share/tkcvs/bitmaps/stat_ok.gif
-share/tkcvs/bitmaps/stat_okay.gif
 share/tkcvs/bitmaps/stat_ood.gif
 share/tkcvs/bitmaps/stat_plus.gif
 share/tkcvs/bitmaps/stat_plus_kb.gif
 share/tkcvs/bitmaps/stat_ques.gif
+share/tkcvs/bitmaps/stat_rcs.gif
+share/tkcvs/bitmaps/stat_rcs_mod.gif
 share/tkcvs/bitmaps/tag.gif
 share/tkcvs/bitmaps/tags.gif
+share/tkcvs/bitmaps/tick.xbm
 share/tkcvs/bitmaps/ticklefish_med.gif
 share/tkcvs/bitmaps/tkcvs-ghost.xbm
 share/tkcvs/bitmaps/tkcvs-help.xbm
 share/tkcvs/bitmaps/tkcvs48.xbm
 share/tkcvs/bitmaps/trace.xbm
 share/tkcvs/bitmaps/unedit.gif
+share/tkcvs/bitmaps/updir.gif
 share/tkcvs/bitmaps/who.gif
 share/tkcvs/annotate.tcl
 share/tkcvs/cde_params.tcl
@@ -80,11 +89,13 @@ share/tkcvs/filebrowse.tcl
 share/tkcvs/gen_log.tcl
 share/tkcvs/help.tcl
 share/tkcvs/import.tcl
+share/tkcvs/joincanvas.tcl
 share/tkcvs/logcanvas.tcl
 share/tkcvs/merge.tcl
 share/tkcvs/modbrowse.tcl
 share/tkcvs/modtree.tcl
 share/tkcvs/modules.tcl
+share/tkcvs/picklist.tcl
 share/tkcvs/reports.tcl
 share/tkcvs/scrollbindings.tcl
 share/tkcvs/search.tcl
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index dcf342249b2..92867c4d521 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/01/28 16:55:54 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/12/22 14:59:25 agc Exp $
 
-SHA1 (tkcvs-7_03.tar.gz) = 751137d7a4067b30a12fd5da2d34ed7b58b982aa
-Size (tkcvs-7_03.tar.gz) = 218921 bytes
-SHA1 (patch-aa) = 698b041bb86759c16c536931209758a67e2f616a
+SHA1 (tkcvs_7_1_2.tar.gz) = 01342ef43bb6d04bb1daa9b760510ccc60e8ba6a
+Size (tkcvs_7_1_2.tar.gz) = 239874 bytes
+SHA1 (patch-aa) = 6e052f9b1a697665a965db409c5592e115fe2832
diff --git a/devel/tkcvs/patches/patch-aa b/devel/tkcvs/patches/patch-aa
index 90aa744187f..dcb1239a92d 100644
--- a/devel/tkcvs/patches/patch-aa
+++ b/devel/tkcvs/patches/patch-aa
@@ -1,22 +1,27 @@
-$NetBSD: patch-aa,v 1.7 2002/01/28 16:55:55 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2002/12/22 14:59:26 agc Exp $
 
 --- doinstall.tcl.orig	Wed Jan 23 18:18:03 2002
 +++ doinstall.tcl
-@@ -2,5 +2,5 @@
+@@ -1,7 +1,7 @@
+ #!/bin/sh
  #-*-tcl-*-
  # the next line restarts using wish \
 -if [ -z "$DISPLAY" ]; then exec tclsh "$0" -- ${1+"$@"}; else exec wish "$0" -- ${1+"$@"}; fi
 +exec tclsh "$0" -- ${1+"$@"}
  
  #
-@@ -29,5 +29,5 @@
+ # $Id: patch-aa,v 1.8 2002/12/22 14:59:26 agc Exp $
+@@ -29,7 +29,7 @@
+     set MANDIR ""
    } else {
      set BINDIR [file join $INSTALLROOT bin]
 -    set LIBDIR [file join $INSTALLROOT lib]
 +    set LIBDIR [file join $INSTALLROOT share]
      set MANDIR [file join $INSTALLROOT man man1]
    }
-@@ -40,21 +40,4 @@
+ }
+@@ -40,23 +40,6 @@
+   global LIBDIR BINDIR MANDIR
  
    set_paths $INSTALLROOT
 -
@@ -38,7 +43,9 @@ $NetBSD: patch-aa,v 1.7 2002/01/28 16:55:55 wiz Exp $
 -  }
  }
  
-@@ -117,11 +100,4 @@
+ proc doinstall { INSTALLROOT } {
+@@ -117,13 +100,6 @@
+   }
    cd ..
    puts "Finished!"
 -
@@ -50,15 +57,18 @@ $NetBSD: patch-aa,v 1.7 2002/01/28 16:55:55 wiz Exp $
 -  }
  }
  
-@@ -136,10 +112,5 @@
+ ################################################################################
+@@ -132,12 +108,7 @@
+ set X 1
  
  # Check Tcl/TK version
--if {$tcl_version < 8.1} {
+-if {$tcl_version < 8.3} {
 -   tk_dialog .wrongversion "Tcl/Tk too old" \
--   "TkCVS requires Tcl/Tk 8.1 or better!" \
+-   "TkCVS requires Tcl/Tk 8.3 or better!" \
 -   error 0 {Bye Bye}
 -   exit 1
 -}
 +# This is done by the package Makefile
  
- # Some rational and reasonable defaults.
+ # Do this after checking tcl version, because 7.x doesn't have it.
+ puts "[info nameofexecutable]"