Update to 8.2.3. Notable changes:

- TkCVS now supports Subversion (up to 1.7). If SVN repository has a structure
  similar to trunk, branches, and tags but with different names, you can tell
  TkCVS about it.
- The previously undocumented RCS support is explicit now.

- Rework the merge functionality.  There's only one dialog for tagging, which
  you OK when you're ready to commit the merges.
- Merge arrows are drawn in the Branch Browser for merges tracked by
  Subversion 1.5's mergeinfo property and CVSNT's mergepoint feature.

- The Branch Browser positions the diagram so "you are here" is in the visible
  canvas, fixing a long-time nagging irritation.
- Locking and unlocking for SVN, and some additional SVN-specific right-click
  popups.

4 files changed, 62 insertions, 41 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 7f83fe1d77f..3be5fd33137 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2012/10/31 11:19:50 asau Exp $
+# $NetBSD: Makefile,v 1.39 2013/08/21 10:14:54 shattered Exp $
 #
 
-DISTNAME=	tkcvs_7_2_1
-PKGNAME=	tkcvs-7.2.1
-PKGREVISION=	1
+DISTNAME=	tkcvs-8.2.3
 CATEGORIES=	devel scm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tkcvs/}
 
diff --git a/devel/tkcvs/PLIST b/devel/tkcvs/PLIST
index 3d7564a00ba..77f2a571815 100644
--- a/devel/tkcvs/PLIST
+++ b/devel/tkcvs/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:49:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/08/21 10:14:54 shattered Exp $
 bin/tkcvs
 bin/tkdiff
+lib/tkcvs/annotate.tcl
 lib/tkcvs/bitmaps/add.gif
 lib/tkcvs/bitmaps/adir.gif
 lib/tkcvs/bitmaps/amod.gif
+lib/tkcvs/bitmaps/anglerfish_med.gif
 lib/tkcvs/bitmaps/annotate.gif
 lib/tkcvs/bitmaps/annotate.xbm
-lib/tkcvs/bitmaps/arrow.gif
 lib/tkcvs/bitmaps/arrow_dn.gif
 lib/tkcvs/bitmaps/arrow_hl_dn.gif
 lib/tkcvs/bitmaps/arrow_hl_up.gif
 lib/tkcvs/bitmaps/arrow_up.gif
-lib/tkcvs/bitmaps/ball.gif
 lib/tkcvs/bitmaps/branch.gif
 lib/tkcvs/bitmaps/branch.xbm
 lib/tkcvs/bitmaps/branchtag.gif
@@ -23,10 +23,15 @@ lib/tkcvs/bitmaps/conflict.gif
 lib/tkcvs/bitmaps/cvs-says.xbm
 lib/tkcvs/bitmaps/cvsdir.gif
 lib/tkcvs/bitmaps/delete.gif
+lib/tkcvs/bitmaps/delete_red.gif
 lib/tkcvs/bitmaps/diff.gif
 lib/tkcvs/bitmaps/dir.gif
-lib/tkcvs/bitmaps/dir.xbm
+lib/tkcvs/bitmaps/dir_minus.gif
 lib/tkcvs/bitmaps/dir_new.gif
+lib/tkcvs/bitmaps/dir_ok.gif
+lib/tkcvs/bitmaps/dir_ood.gif
+lib/tkcvs/bitmaps/dir_plus.gif
+lib/tkcvs/bitmaps/dir_ques.gif
 lib/tkcvs/bitmaps/dirbranch.gif
 lib/tkcvs/bitmaps/dirbranch.xbm
 lib/tkcvs/bitmaps/edit.gif
@@ -37,22 +42,31 @@ lib/tkcvs/bitmaps/fileview.gif
 lib/tkcvs/bitmaps/folder.gif
 lib/tkcvs/bitmaps/folderopen.gif
 lib/tkcvs/bitmaps/import.gif
-lib/tkcvs/bitmaps/logfile.gif
+lib/tkcvs/bitmaps/link.gif
+lib/tkcvs/bitmaps/link_mod.gif
+lib/tkcvs/bitmaps/link_modml.gif
+lib/tkcvs/bitmaps/link_modol.gif
+lib/tkcvs/bitmaps/link_ok.gif
+lib/tkcvs/bitmaps/link_okml.gif
+lib/tkcvs/bitmaps/link_okol.gif
+lib/tkcvs/bitmaps/link_plus.gif
+lib/tkcvs/bitmaps/link_ques.gif
+lib/tkcvs/bitmaps/locked.gif
+lib/tkcvs/bitmaps/log.gif
+lib/tkcvs/bitmaps/loop-ball.gif
 lib/tkcvs/bitmaps/loop-glasses.gif
-lib/tkcvs/bitmaps/loop-half.gif
-lib/tkcvs/bitmaps/loop.gif
 lib/tkcvs/bitmaps/man.gif
 lib/tkcvs/bitmaps/mdir.gif
-lib/tkcvs/bitmaps/merge.gif
-lib/tkcvs/bitmaps/merge_changes.gif
 lib/tkcvs/bitmaps/mod.gif
 lib/tkcvs/bitmaps/modbrowse.gif
+lib/tkcvs/bitmaps/modbrowse_cvs.gif
+lib/tkcvs/bitmaps/modbrowse_svn.gif
+lib/tkcvs/bitmaps/newmerge.gif
+lib/tkcvs/bitmaps/newmerge_simple.gif
 lib/tkcvs/bitmaps/paper.gif
-lib/tkcvs/bitmaps/patches.gif
 lib/tkcvs/bitmaps/patchfile.gif
 lib/tkcvs/bitmaps/rcsdir.gif
 lib/tkcvs/bitmaps/rdiff.gif
-lib/tkcvs/bitmaps/refresh.gif
 lib/tkcvs/bitmaps/remove.gif
 lib/tkcvs/bitmaps/stat_conf.gif
 lib/tkcvs/bitmaps/stat_ex.gif
@@ -60,30 +74,31 @@ lib/tkcvs/bitmaps/stat_kb.gif
 lib/tkcvs/bitmaps/stat_merge.gif
 lib/tkcvs/bitmaps/stat_minus.gif
 lib/tkcvs/bitmaps/stat_mod.gif
+lib/tkcvs/bitmaps/stat_modml.gif
+lib/tkcvs/bitmaps/stat_modol.gif
 lib/tkcvs/bitmaps/stat_ok.gif
+lib/tkcvs/bitmaps/stat_okml.gif
+lib/tkcvs/bitmaps/stat_okol.gif
 lib/tkcvs/bitmaps/stat_ood.gif
 lib/tkcvs/bitmaps/stat_plus.gif
 lib/tkcvs/bitmaps/stat_plus_kb.gif
 lib/tkcvs/bitmaps/stat_ques.gif
-lib/tkcvs/bitmaps/stat_rcs.gif
-lib/tkcvs/bitmaps/stat_rcs_mod.gif
+lib/tkcvs/bitmaps/svndir.gif
 lib/tkcvs/bitmaps/tag.gif
 lib/tkcvs/bitmaps/tags.gif
-lib/tkcvs/bitmaps/tick.xbm
+lib/tkcvs/bitmaps/ticklefish48.gif
 lib/tkcvs/bitmaps/ticklefish_med.gif
-lib/tkcvs/bitmaps/tkcvs-ghost.xbm
 lib/tkcvs/bitmaps/tkcvs-help.xbm
-lib/tkcvs/bitmaps/tkcvs16.xbm
 lib/tkcvs/bitmaps/tkcvs48.xbm
 lib/tkcvs/bitmaps/trace.xbm
 lib/tkcvs/bitmaps/unedit.gif
+lib/tkcvs/bitmaps/unlocked.gif
 lib/tkcvs/bitmaps/updir.gif
 lib/tkcvs/bitmaps/who.gif
-lib/tkcvs/annotate.tcl
-lib/tkcvs/cde_params.tcl
-lib/tkcvs/commit.tcl
+lib/tkcvs/branch_diagram.tcl
 lib/tkcvs/cvs.tcl
 lib/tkcvs/dialog.tcl
+lib/tkcvs/diff.tcl
 lib/tkcvs/dircanvas.tcl
 lib/tkcvs/errors.tcl
 lib/tkcvs/exec.tcl
@@ -93,18 +108,18 @@ lib/tkcvs/help.tcl
 lib/tkcvs/import.tcl
 lib/tkcvs/import2.tcl
 lib/tkcvs/joincanvas.tcl
-lib/tkcvs/logcanvas.tcl
-lib/tkcvs/merge.tcl
 lib/tkcvs/modbrowse.tcl
 lib/tkcvs/modtree.tcl
 lib/tkcvs/modules.tcl
 lib/tkcvs/picklist.tcl
-lib/tkcvs/reports.tcl
-lib/tkcvs/scrollbindings.tcl
-lib/tkcvs/search.tcl
-lib/tkcvs/static.tcl
+lib/tkcvs/rcs.tcl
+lib/tkcvs/style_params.tcl
+lib/tkcvs/svn-import.tcl
+lib/tkcvs/svn.tcl
 lib/tkcvs/tclIndex
 lib/tkcvs/tkcvs_def.tcl
 lib/tkcvs/tooltips.tcl
+lib/tkcvs/ui_misc.tcl
+lib/tkcvs/vendor_merge.tcl
 lib/tkcvs/workdir.tcl
 man/man1/tkcvs.1
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index e4887e935dd..8adda7ed05c 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2005/02/23 22:24:34 agc Exp $
+$NetBSD: distinfo,v 1.14 2013/08/21 10:14:54 shattered Exp $
 
-SHA1 (tkcvs_7_2_1.tar.gz) = fd5bc8687748e6b62ff84fd08ded7bf09e653101
-RMD160 (tkcvs_7_2_1.tar.gz) = acca6d1fd328f994f063ef2ec4eebd7b3867318e
-Size (tkcvs_7_2_1.tar.gz) = 1083178 bytes
-SHA1 (patch-aa) = 4a033f1416d9500a166e114cc829741df6152cd6
+SHA1 (tkcvs-8.2.3.tar.gz) = 16e994c638ad42e0ad89f1fe404835d3804e8d6c
+RMD160 (tkcvs-8.2.3.tar.gz) = 62f80f45341fb4c52212b26845fbb64a8e8c133b
+Size (tkcvs-8.2.3.tar.gz) = 570910 bytes
+SHA1 (patch-aa) = 290f23ce63b2f290a4769a25d123de8a128c5527
diff --git a/devel/tkcvs/patches/patch-aa b/devel/tkcvs/patches/patch-aa
index 8db6515f2d6..da7e2d9417e 100644
--- a/devel/tkcvs/patches/patch-aa
+++ b/devel/tkcvs/patches/patch-aa
@@ -1,15 +1,18 @@
-$NetBSD: patch-aa,v 1.12 2004/04/29 15:46:00 minskim Exp $
+$NetBSD: patch-aa,v 1.13 2013/08/21 10:14:54 shattered Exp $
 
---- doinstall.tcl.orig	2004-03-15 23:40:54.000000000 -0600
+--- doinstall.tcl.orig	2011-11-28 04:59:54.000000000 +0000
 +++ doinstall.tcl
-@@ -2,5 +2,5 @@
+@@ -1,7 +1,7 @@
+ #!/bin/sh
  #-*-tcl-*-
  # the next line restarts using wish \
 -if [ -z "$DISPLAY"  -o "X$1" = "X-nox" ]; then exec tclsh "$0" -- ${1+"$@"}; else exec wish "$0" -- ${1+"$@"}; fi
 +exec tclsh "$0" -- ${1+"$@"}
  
  #
-@@ -34,21 +34,4 @@ proc show_paths {INSTALLROOT} {
+ # Usage: doinstall.tcl [-nox] [destination]
+@@ -31,23 +31,6 @@ proc show_paths {INSTALLROOT} {
+   global LIBDIR BINDIR MANDIR
  
    set_paths $INSTALLROOT
 -
@@ -31,8 +34,10 @@ $NetBSD: patch-aa,v 1.12 2004/04/29 15:46:00 minskim Exp $
 -  }
  }
  
-@@ -100,11 +83,4 @@ proc doinstall { INSTALLROOT } {
-   cd ..
+ proc doinstall { INSTALLROOT } {
+@@ -97,13 +80,6 @@ proc doinstall { INSTALLROOT } {
+   }
+   cd [file join .. ..]
    puts "Finished!"
 -
 -  if {$X} {
@@ -43,7 +48,9 @@ $NetBSD: patch-aa,v 1.12 2004/04/29 15:46:00 minskim Exp $
 -  }
  }
  
-@@ -115,10 +91,5 @@ set X 1
+ ################################################################################
+@@ -112,12 +88,7 @@ set usage "Usage: doinstall.tcl \[-nox\]
+ set X 1
  
  # Check Tcl/TK version
 -if {$tcl_version < 8.3} {
@@ -55,3 +62,4 @@ $NetBSD: patch-aa,v 1.12 2004/04/29 15:46:00 minskim Exp $
 +# This is done by the package Makefile
  
  # See if the user changed them with command-line args
+ set ArgInstallRoot ""