Update tkcvs to 7.0

Changelog:

- Improved main file-browsing window.  It now has icons to indicate the status
  of the files.  The right mouse button activates context-sensitive popup menus.
  As a consequence of using a canvas widget instead of a listbox, the selection
  mechanism is different.  It's click to select, shift-click to add selection,
  click-on-background to deselect all.  The right button does an area select.

- The module browser reads whatever information is available in the
  modules file via "cvs checkout -c" before it looks for the tkcvs-specific
  extensions.  Thus if there is a modules file at all, some information
  will be available without the additional comments.

- Options are specified via the options database instead of with cvscfg
  variables.  If the window manager is CDE, its options are used by default.

- The state of the main windows is remembered between sessions.

- Bugs in display of the Editors column are fixed.

- Finally found a good home for the "Checkout with Options" dialog.  Someone
  pointed out that it belongs in the File menu next to the simple Update item.
  I'm conviced that that's right.

- The module browser window is paned so that you can adjust the relative
  width of the columns.

- CVS version 1.11 is supported better.

o converted to use buildlink files, set USE_BUILDLINK_ONLY

Update provided by Ingolf Steinbach <ingolf@jellonet.de> in pkg/13366,
thanks for the PR!

4 files changed, 56 insertions, 61 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index aa26a508aa2..18c0fcf8ffb 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2001/02/28 12:29:29 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/07/03 20:59:40 zuntum Exp $
 #
 
-DISTNAME=	tkcvs-6.4
+DISTNAME=	tkcvs-7.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.twobarleycorns.net/ \
 		${MASTER_SITE_SOURCEFORGE:=tkcvs/}
@@ -10,9 +10,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.twobarleycorns.net/tkcvs.html
 COMMENT=	Tcl/Tk frontends to CVS and diff
 
-DEPENDS+=	tk>=8.1:../../x11/tk
-
-NO_BUILD=	yes
+USE_BUILDLINK_ONLY=	YES
+NO_BUILD=		YES
 
 post-extract:
 	${MV} ${WRKSRC}/tkcvs/tkcvs.n ${WRKSRC}/tkcvs/tkcvs.1
@@ -24,4 +23,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkcvs
 	${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/
 
+.include "../../x11/tk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index aebf3521437..ff7112de703 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:48 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/03 20:59:40 zuntum Exp $
 
-SHA1 (tkcvs-6.4.tar.gz) = 94c3214cef564ca2651a5f81ff66c397a8d04a79
-Size (tkcvs-6.4.tar.gz) = 191411 bytes
-SHA1 (patch-aa) = 853943fefdf60d3f84e2d96e142bdda3bd18fbf9
+SHA1 (tkcvs-7.0.tar.gz) = 6fd35b9308c67f1287443c472dbfc9cf2f4b3777
+Size (tkcvs-7.0.tar.gz) = 222395 bytes
+SHA1 (patch-aa) = 21daa6567d1c36ce0adf3a50ab9b4b231fee92cb
diff --git a/devel/tkcvs/patches/patch-aa b/devel/tkcvs/patches/patch-aa
index 577d052dbbb..06e5b699d77 100644
--- a/devel/tkcvs/patches/patch-aa
+++ b/devel/tkcvs/patches/patch-aa
@@ -1,25 +1,31 @@
-$NetBSD: patch-aa,v 1.5 2001/02/28 12:29:30 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2001/07/03 20:59:40 zuntum Exp $
 
---- doinstall.tcl.orig	Fri Sep 29 06:44:53 2000
+--- doinstall.tcl.orig	Sun Dec 31 04:28:19 2000
 +++ doinstall.tcl
 @@ -2,5 +2,5 @@
  #-*-tcl-*-
  # the next line restarts using wish \
--exec wish "$0" -- ${1+"$@"}
-+exec tclsh "$0" "$@"
+-if [ -z "$DISPLAY" ]; then exec tclsh "$0" -- ${1+"$@"}; else exec wish "$0" -- ${1+"$@"}; fi
++exec tclsh "$0" -- ${1+"$@"}
  
  #
-@@ -19,23 +19,6 @@
+@@ -20,6 +20,6 @@
    } else {
      set BINDIR [file join $INSTALLROOT bin]
 -    set LIBDIR [file join $INSTALLROOT lib]
 -    set MANDIR [file join $INSTALLROOT man mann]
--  }
++    set LIBDIR [file join $INSTALLROOT share]
++    set MANDIR [file join $INSTALLROOT man man1]
+   }
+ }
+@@ -31,21 +31,4 @@
+ 
+   set_paths $INSTALLROOT
 -
 -  set msg(1) [file join $BINDIR $TKCVS]
 -  set msg(2) [file join $BINDIR $TKDIFF]
 -  set msg(3) [file join $LIBDIR tkcvs *.tcl]
--  set msg(4) [file join $LIBDIR tkcvs bitmaps *.gif]
+-  set msg(4) [file join $LIBDIR tkcvs bitmaps *.gif,xbm]
 -  if {$tcl_platform(platform) == "unix"} {
 -     set msg(5) [file join $MANDIR tkcvs.n]
 -  }
@@ -31,11 +37,10 @@ $NetBSD: patch-aa,v 1.5 2001/02/28 12:29:30 wiz Exp $
 -    set var$m $msg($m)
 -    label .messages.$m -text $msg($m) -justify left -textvariable var$m
 -    pack .messages.$m -side top -anchor w
-+    set LIBDIR [file join $INSTALLROOT share]
-+    set MANDIR [file join $INSTALLROOT man man1]
-   }
+-  }
  }
-@@ -76,6 +59,6 @@
+ 
+@@ -84,6 +67,6 @@
      file attributes [file join $BINDIR $TKDIFF] -permissions 0755
      file mkdir $MANDIR
 -    puts "Installing manpage tkcvs.n in $MANDIR"
@@ -44,20 +49,22 @@ $NetBSD: patch-aa,v 1.5 2001/02/28 12:29:30 wiz Exp $
 +    file copy -force [file join tkcvs tkcvs.1] $MANDIR
    }
  
-@@ -95,9 +78,4 @@
+@@ -103,11 +86,4 @@
    cd ..
    puts "Finished!"
 -
--  destroy .bottom.do
--  destroy .bottom.not
--  button .bottom.done -text "Finished!" -command {destroy .}
--  pack .bottom.done
+-  if {$X} {
+-    destroy .bottom.do
+-    destroy .bottom.not
+-    button .bottom.done -text "Finished!" -command {destroy .}
+-    pack .bottom.done
+-  }
  }
  
-@@ -105,10 +83,5 @@
+@@ -122,10 +98,5 @@
  
  # Check Tcl/TK version
--if {$tk_version < 8.1} {
+-if {$tcl_version < 8.1} {
 -   tk_dialog .wrongversion "Tcl/Tk too old" \
 -   "TkCVS requires Tcl/Tk 8.1 or better!" \
 -   error 0 {Bye Bye}
@@ -66,33 +73,3 @@ $NetBSD: patch-aa,v 1.5 2001/02/28 12:29:30 wiz Exp $
 +# This is done by the package Makefile
  
  # Some rational and reasonable defaults.
-@@ -128,27 +101,5 @@
-   set INSTALLROOT [lindex $argv 0]
- }
--frame .title
--label .title.lbl -text "TkCVS Installer" -font {Helvetica -14 bold}
--pack .title -side top
--pack .title.lbl -side top
--frame .entry
--label .entry.instlbl -text "Installation Root"
--entry .entry.instent -textvariable INSTALLROOT
--bind .entry.instent <Return> {show_paths $INSTALLROOT}
--pack .entry -side top -pady 10
--pack .entry.instlbl -side left
--pack .entry.instent -side left
--
--frame .messages -relief groove -bd 2
--pack .messages -side top -expand y -fill x
--label .messages.adv -text "These files will be installed:"
--pack .messages.adv -side top
--show_paths $INSTALLROOT
--
--frame .bottom
--button .bottom.do -text "Install" -command {doinstall $INSTALLROOT}
--button .bottom.not -text "Cancel" -command {destroy .}
--pack .bottom -side top
--pack .bottom.do -side left
--pack .bottom.not -side left
- 
-+show_paths $INSTALLROOT
-+doinstall $INSTALLROOT
diff --git a/devel/tkcvs/pkg/PLIST b/devel/tkcvs/pkg/PLIST
index 711decfd3db..2fb01273a70 100644
--- a/devel/tkcvs/pkg/PLIST
+++ b/devel/tkcvs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/02/28 12:29:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/07/03 20:59:40 zuntum Exp $
 bin/tkcvs
 bin/tkdiff
 man/man1/tkcvs.1
@@ -19,6 +19,7 @@ share/tkcvs/bitmaps/checkout.gif
 share/tkcvs/bitmaps/clean.gif
 share/tkcvs/bitmaps/clear.gif
 share/tkcvs/bitmaps/conflict.gif
+share/tkcvs/bitmaps/cvsdir.gif
 share/tkcvs/bitmaps/delete.gif
 share/tkcvs/bitmaps/diff.gif
 share/tkcvs/bitmaps/dir.gif
@@ -27,6 +28,9 @@ share/tkcvs/bitmaps/export.gif
 share/tkcvs/bitmaps/fileedit.gif
 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
@@ -37,27 +41,40 @@ share/tkcvs/bitmaps/mergebranch.gif
 share/tkcvs/bitmaps/mergediff.gif
 share/tkcvs/bitmaps/mod.gif
 share/tkcvs/bitmaps/modbrowse.gif
-share/tkcvs/bitmaps/modbrowse.xbm
 share/tkcvs/bitmaps/modules.gif
+share/tkcvs/bitmaps/paper.gif
 share/tkcvs/bitmaps/patches.gif
 share/tkcvs/bitmaps/patchfile.gif
 share/tkcvs/bitmaps/refresh.gif
 share/tkcvs/bitmaps/remove.gif
+share/tkcvs/bitmaps/stat_conf.gif
+share/tkcvs/bitmaps/stat_ex.gif
+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_ood.gif
+share/tkcvs/bitmaps/stat_plus.gif
+share/tkcvs/bitmaps/stat_ques.gif
 share/tkcvs/bitmaps/tag.gif
 share/tkcvs/bitmaps/tags.gif
 share/tkcvs/bitmaps/tclfish.gif
 share/tkcvs/bitmaps/tclfish.xbm
 share/tkcvs/bitmaps/tclfish_fly.xbm
-share/tkcvs/bitmaps/tkcvs32.xbm
-share/tkcvs/bitmaps/tkcvs32_mask.xbm
+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/who.gif
+share/tkcvs/annotate.tcl
+share/tkcvs/cde_params.tcl
 share/tkcvs/commit.tcl
 share/tkcvs/cvs.tcl
 share/tkcvs/dialog.tcl
+share/tkcvs/dircanvas.tcl
 share/tkcvs/errors.tcl
+share/tkcvs/exec.tcl
 share/tkcvs/filebrowse.tcl
 share/tkcvs/gen_log.tcl
 share/tkcvs/help.tcl
@@ -68,6 +85,7 @@ share/tkcvs/modbrowse.tcl
 share/tkcvs/modtree.tcl
 share/tkcvs/modules.tcl
 share/tkcvs/reports.tcl
+share/tkcvs/scrollbindings.tcl
 share/tkcvs/search.tcl
 share/tkcvs/static.tcl
 share/tkcvs/tclIndex