5 files changed, 56 insertions, 108 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 75bf3ff4b576..9acae6ee11ec 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -6,19 +6,20 @@
 #
 
 PORTNAME=	tkcvs
-PORTVERSION=	6.4
-CATEGORIES=	devel tk82
+PORTVERSION=	7.0.3
+CATEGORIES=	devel tk83
 MASTER_SITES=	http://www.twobarleycorns.net/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/:S/.//g}
 
 MAINTAINER=	shanee@augusta.de
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
 NO_BUILD=	yes
-MANN=		tkcvs.n
+MAN1=		tkcvs.1
 
-WISH=		wish8\.2
-TCLSH=		tclsh8\.2
+WISH=		wish8\.3
+TCLSH=		tclsh8\.3
 
 post-patch:
 	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkcvs/tkcvs.blank
@@ -26,7 +27,7 @@ post-patch:
 	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/doinstall.tcl
 
 do-install:
-	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${TCLSH} doinstall.tcl)
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${TCLSH} doinstall.tcl -nox ${PREFIX}
 
 post-install:
 .if !defined{NOPORTDOCS}
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 1fe4649a44b2..488405a47103 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1 +1 @@
-MD5 (tkcvs-6.4.tar.gz) = dec18bb61e49a4b3eceacfd83ca07a36
+MD5 (tkcvs-7_03.tar.gz) = ef4bc8916234fac04f9e809faa416f8d
diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa
deleted file mode 100644
index f135973b53b4..000000000000
--- a/devel/tkcvs/files/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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]
-   }
-   foreach m [lsort [array names msg]] {
--    if {[winfo exists .messages.$m]} {
--      destroy .messages.$m
--    }
-     global var$m
-     set var$m $msg($m)
--    label .messages.$m -text $msg($m) -justify left -textvariable var$m
--    pack .messages.$m -side top -anchor w
-+    puts var$m
-   }
- }
- 
-@@ -94,23 +90,10 @@
-   }
-   cd ..
-   puts "Finished!"
--
--  destroy .bottom.do
--  destroy .bottom.not
--  button .bottom.done -text "Finished!" -command {destroy .}
--  pack .bottom.done
- }
- 
- ################################################################################
- 
--# 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
--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
-+exit 0
- 
diff --git a/devel/tkcvs/pkg-descr b/devel/tkcvs/pkg-descr
index 93bc914e1da3..816a4a2ebecd 100644
--- a/devel/tkcvs/pkg-descr
+++ b/devel/tkcvs/pkg-descr
@@ -1,3 +1,3 @@
 This is a port of tkcvs and tkdiff, the Tcl/Tk frontends to CVS and diff 
 
-This is tkcvs version 6.3 and tkdiff version 1.0.
+This is tkcvs version 7.0.3 and tkdiff version 3.09.
diff --git a/devel/tkcvs/pkg-plist b/devel/tkcvs/pkg-plist
index e9b09c0b3309..03971539f82d 100644
--- a/devel/tkcvs/pkg-plist
+++ b/devel/tkcvs/pkg-plist
@@ -1,25 +1,7 @@
+@comment $FreeBSD$
 bin/tkcvs
 bin/tkdiff
-lib/tkcvs/commit.tcl
-lib/tkcvs/cvs.tcl
-lib/tkcvs/dialog.tcl
-lib/tkcvs/errors.tcl
-lib/tkcvs/filebrowse.tcl
-lib/tkcvs/gen_log.tcl
-lib/tkcvs/help.tcl
-lib/tkcvs/import.tcl
-lib/tkcvs/logcanvas.tcl
-lib/tkcvs/merge.tcl
-lib/tkcvs/modbrowse.tcl
-lib/tkcvs/modtree.tcl
-lib/tkcvs/modules.tcl
-lib/tkcvs/reports.tcl
-lib/tkcvs/search.tcl
-lib/tkcvs/static.tcl
-lib/tkcvs/tclIndex
-lib/tkcvs/tkcvs_def.tcl
-lib/tkcvs/tooltips.tcl
-lib/tkcvs/workdir.tcl
+lib/tkcvs/annotate.tcl
 lib/tkcvs/bitmaps/add.gif
 lib/tkcvs/bitmaps/adir.gif
 lib/tkcvs/bitmaps/amod.gif
@@ -36,6 +18,7 @@ lib/tkcvs/bitmaps/checkout.gif
 lib/tkcvs/bitmaps/clean.gif
 lib/tkcvs/bitmaps/clear.gif
 lib/tkcvs/bitmaps/conflict.gif
+lib/tkcvs/bitmaps/cvsdir.gif
 lib/tkcvs/bitmaps/delete.gif
 lib/tkcvs/bitmaps/diff.gif
 lib/tkcvs/bitmaps/dir.gif
@@ -44,6 +27,9 @@ lib/tkcvs/bitmaps/export.gif
 lib/tkcvs/bitmaps/fileedit.gif
 lib/tkcvs/bitmaps/files.gif
 lib/tkcvs/bitmaps/fileview.gif
+lib/tkcvs/bitmaps/folder.gif
+lib/tkcvs/bitmaps/folderopen.gif
+lib/tkcvs/bitmaps/gray75.xbm
 lib/tkcvs/bitmaps/import.gif
 lib/tkcvs/bitmaps/logfile.gif
 lib/tkcvs/bitmaps/loop-glasses.gif
@@ -54,23 +40,57 @@ 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/paper.gif
 lib/tkcvs/bitmaps/patches.gif
 lib/tkcvs/bitmaps/patchfile.gif
 lib/tkcvs/bitmaps/refresh.gif
 lib/tkcvs/bitmaps/remove.gif
+lib/tkcvs/bitmaps/stat_conf.gif
+lib/tkcvs/bitmaps/stat_ex.gif
+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_ok.gif
+lib/tkcvs/bitmaps/stat_okay.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/tag.gif
 lib/tkcvs/bitmaps/tags.gif
-lib/tkcvs/bitmaps/tclfish.gif
-lib/tkcvs/bitmaps/tclfish.xbm
-lib/tkcvs/bitmaps/tclfish_fly.xbm
-lib/tkcvs/bitmaps/tkcvs32.xbm
-lib/tkcvs/bitmaps/tkcvs32_mask.xbm
+lib/tkcvs/bitmaps/ticklefish_med.gif
+lib/tkcvs/bitmaps/tkcvs-ghost.xbm
+lib/tkcvs/bitmaps/tkcvs-help.xbm
 lib/tkcvs/bitmaps/tkcvs48.xbm
 lib/tkcvs/bitmaps/trace.xbm
 lib/tkcvs/bitmaps/unedit.gif
 lib/tkcvs/bitmaps/who.gif
+lib/tkcvs/cde_params.tcl
+lib/tkcvs/commit.tcl
+lib/tkcvs/cvs.tcl
+lib/tkcvs/dialog.tcl
+lib/tkcvs/dircanvas.tcl
+lib/tkcvs/errors.tcl
+lib/tkcvs/exec.tcl
+lib/tkcvs/filebrowse.tcl
+lib/tkcvs/gen_log.tcl
+lib/tkcvs/help.tcl
+lib/tkcvs/import.tcl
+lib/tkcvs/logcanvas.tcl
+lib/tkcvs/merge.tcl
+lib/tkcvs/modbrowse.tcl
+lib/tkcvs/modtree.tcl
+lib/tkcvs/modules.tcl
+lib/tkcvs/reports.tcl
+lib/tkcvs/scrollbindings.tcl
+lib/tkcvs/search.tcl
+lib/tkcvs/static.tcl
+lib/tkcvs/tclIndex
+lib/tkcvs/tkcvs_def.tcl
+lib/tkcvs/tooltips.tcl
+lib/tkcvs/workdir.tcl
 share/doc/tkcvs/README.tkcvs
 @dirrm lib/tkcvs/bitmaps
 @dirrm lib/tkcvs