Update to version 6.4.

PR:		23307
Submitted by:	Alexander N. Kabaev <ak03@gte.com>

4 files changed, 37 insertions, 15 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 4fffd82e3661..91f0ad12d94d 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tkcvs
-PORTVERSION=	6.3
+PORTVERSION=	6.4
 CATEGORIES=	devel tk82
 MASTER_SITES=	http://www.twobarleycorns.net/
 
@@ -23,6 +23,7 @@ TCLSH=		tclsh8\.2
 post-patch:
 	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkcvs/tkcvs.blank
 	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkdiff/tkdiff
+	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/doinstall.tcl
 
 do-install:
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${TCLSH} doinstall.tcl)
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 881784f03497..1fe4649a44b2 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1 +1 @@
-MD5 (tkcvs-6.3.tar.gz) = 59b141fcc658330939c9512033e15894
+MD5 (tkcvs-6.4.tar.gz) = dec18bb61e49a4b3eceacfd83ca07a36
diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa
index 2df064e5f636..f135973b53b4 100644
--- a/devel/tkcvs/files/patch-aa
+++ b/devel/tkcvs/files/patch-aa
@@ -1,8 +1,5 @@
---- doinstall.tcl.orig	Sun May  7 01:12:41 2000
-+++ doinstall.tcl	Mon Sep  4 17:06:32 2000
-@@ -4,1 +4,1 @@
--exec wish "$0" -- ${1+"$@"}
-+exec wish8.2 "$0" -- ${1+"$@"}
+--- doinstall.tcl.orig	Fri Sep 29 00:44:53 2000
++++ doinstall.tcl	Tue Dec  5 12:55:13 2000
 @@ -30,13 +30,9 @@
       set msg(5) [file join $MANDIR tkcvs.n]
    }
@@ -18,7 +15,7 @@
    }
  }
  
-@@ -94,11 +90,6 @@
+@@ -94,23 +90,10 @@
    }
    cd ..
    puts "Finished!"
@@ -29,11 +26,23 @@
 -  pack .bottom.done
  }
  
- #
-@@ -115,28 +106,6 @@
-   set TKDIFF "tkdiff"
- }
+ ################################################################################
+ 
+-# Check Tcl/TK version
+-if {$tk_version < 8.1} {
+-   tk_dialog .wrongversion "Tcl/Tk too old" \
+-   "TkCVS requires Tcl/Tk 8.1 or better!" \
+-   error 0 {Bye Bye}
+-   exit 1
+-}
+-
+ # Some rational and reasonable defaults.
  
+ if {$tcl_platform(platform) == "windows"} {
+@@ -127,28 +110,8 @@
+ if {[llength $argv] == 1} {
+   set INSTALLROOT [lindex $argv 0]
+ }
 -frame .title
 -label .title.lbl -text "TkCVS Installer" -font {Helvetica -14 bold}
 -pack .title -side top
@@ -50,14 +59,15 @@
 -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
--
+-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
 +exit 0
+ 
diff --git a/devel/tkcvs/pkg-plist b/devel/tkcvs/pkg-plist
index 5998a94ffd39..e9b09c0b3309 100644
--- a/devel/tkcvs/pkg-plist
+++ b/devel/tkcvs/pkg-plist
@@ -24,6 +24,10 @@ lib/tkcvs/bitmaps/add.gif
 lib/tkcvs/bitmaps/adir.gif
 lib/tkcvs/bitmaps/amod.gif
 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/branchtag.gif
@@ -35,16 +39,21 @@ lib/tkcvs/bitmaps/conflict.gif
 lib/tkcvs/bitmaps/delete.gif
 lib/tkcvs/bitmaps/diff.gif
 lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/edit.gif
 lib/tkcvs/bitmaps/export.gif
 lib/tkcvs/bitmaps/fileedit.gif
 lib/tkcvs/bitmaps/files.gif
 lib/tkcvs/bitmaps/fileview.gif
 lib/tkcvs/bitmaps/import.gif
 lib/tkcvs/bitmaps/logfile.gif
+lib/tkcvs/bitmaps/loop-glasses.gif
+lib/tkcvs/bitmaps/loop-half.gif
+lib/tkcvs/bitmaps/loop.gif
 lib/tkcvs/bitmaps/mdir.gif
 lib/tkcvs/bitmaps/mergebranch.gif
 lib/tkcvs/bitmaps/mergediff.gif
 lib/tkcvs/bitmaps/mod.gif
+lib/tkcvs/bitmaps/modbrowse.gif
 lib/tkcvs/bitmaps/modbrowse.xbm
 lib/tkcvs/bitmaps/modules.gif
 lib/tkcvs/bitmaps/patches.gif
@@ -59,6 +68,8 @@ lib/tkcvs/bitmaps/tclfish_fly.xbm
 lib/tkcvs/bitmaps/tkcvs32.xbm
 lib/tkcvs/bitmaps/tkcvs32_mask.xbm
 lib/tkcvs/bitmaps/tkcvs48.xbm
+lib/tkcvs/bitmaps/trace.xbm
+lib/tkcvs/bitmaps/unedit.gif
 lib/tkcvs/bitmaps/who.gif
 share/doc/tkcvs/README.tkcvs
 @dirrm lib/tkcvs/bitmaps