diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 0c7ce1e32c59..70ed88958cc7 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,28 +1,39 @@
 PORTNAME=	tkcvs
-PORTVERSION=	8.2.3
-PORTREVISION=	1
+PORTVERSION=	9.3.3
 CATEGORIES=	devel
-MASTER_SITES=	SF \
-		http://www.twobarleycorns.net/
+MASTER_SITES=	https://sourceforge.net/projects/tkcvs/files/:tkcvs \
+		https://BSDforge.com/projects/source/devel/tkcvs/:tkcvsicon
+DISTFILES=	tkcvs_9.3.3.tar.gz:tkcvs \
+		tkcvs.tgz:tkcvsicon
 
 MAINTAINER=	portmaster@BSDforge.com
-COMMENT=	Tcl/Tk frontends to CVS and Subversion
-WWW=		http://www.twobarleycorns.net/tkcvs.html
+COMMENT=	Tcl/Tk based GUI for CVS, Subversion, Git and RCS
+WWW=		https://sourceforge.net/projects/tkcvs/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	tkdiff:textproc/tkdiff
 
-NO_BUILD=	yes
+USES=		tcl tk
+# XFCE isn't strictly available but it adds an entry for xfce4 users
+DESKTOP_ENTRIES="tkcvs" "Tkcvs Revision Control" \
+			"${PREFIX}/share/pixmaps/tkcvs.png" \
+			"tkcvs" "GNOME;X-XFCE;X-Xfce-Toplevel;Development;System;Utility;" \false
 NO_ARCH=	yes
-USES=		tk
+NO_BUILD=	yes
+
+WRKSRC=	${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	${FIND} ${WRKSRC} -type f | ${XARGS} \
-	    ${REINPLACE_CMD} -e '/^exec wish/s|wish|${WISH}|g' -e '/^exec tclsh/s|tclsh|${TCLSH}|g'
+post-extract:
+.for i in contrib/tkdirdiff tkcvs/tkcvs.tcl tkdiff/tkdiff
+	@${REINPLACE_CMD} -e 's|exec\ wish|exec\ ${WISH}|g' ${WRKSRC}/${i}
+.endfor
+	@${REINPLACE_CMD} -e 's|exec\ tclsh|exec\ ${TCLSH}|g' ${WRKSRC}/tkcvs/mkindex
+	@${CP} ${WRKSRC}/tkcvs/tkcvs.tcl ${WRKSRC}/tkcvs/tkcvs
+	@${MV} ${WRKSRC}/../tkcvs.png ${WRKSRC}/
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tkcvs/tkcvs ${STAGEDIR}${PREFIX}/bin
@@ -33,11 +44,12 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/tkcvs/bitmaps
 	${INSTALL_DATA} ${WRKSRC}/tkcvs/bitmaps/*.gif ${STAGEDIR}${PREFIX}/lib/tkcvs/bitmaps
 	${INSTALL_DATA} ${WRKSRC}/tkcvs/bitmaps/*.xbm ${STAGEDIR}${PREFIX}/lib/tkcvs/bitmaps
+	${INSTALL_DATA} ${WRKSRC}/tkcvs.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in CHANGELOG.txt FAQ.txt INSTALL
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
+.for f in CHANGELOG.txt FAQ.txt INSTALL
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 2175b32447b1..0fc47587e193 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1,2 +1,5 @@
-SHA256 (tkcvs-8.2.3.tar.gz) = 4bfb29dd9ffbbbc1e6e611e1c772af745d742d336e797bf056dbf70116b8e32a
-SIZE (tkcvs-8.2.3.tar.gz) = 570910
+TIMESTAMP = 1709844381
+SHA256 (tkcvs_9.3.3.tar.gz) = 350cf2aa37b3aa2d7b84d6f971b7108c0914eb66d5523d28a81146dc410978c9
+SIZE (tkcvs_9.3.3.tar.gz) = 671572
+SHA256 (tkcvs.tgz) = 0f47cc5605445ba06d4d1b8cb5ddad878dec1a9a274e3590a686b8dbbbff9b2e
+SIZE (tkcvs.tgz) = 6544
diff --git a/devel/tkcvs/pkg-descr b/devel/tkcvs/pkg-descr
index b87126742c56..02a63b4d574a 100644
--- a/devel/tkcvs/pkg-descr
+++ b/devel/tkcvs/pkg-descr
@@ -1,7 +1,7 @@
-TkCVS is a Tcl/Tk-based graphical interface to the CVS, and Subversion
-configuration management systems. It will also help with RCS. The user
-interface is consistent across Unix/Linux, Windows, and MacOS X. TkDiff
-is included for browsing and merging your changes.
+TkCVS is a Tcl/Tk-based graphical interface to the CVS, Subversion, and
+GIT configuration management systems. It will also help with RCS. The
+user interface is consistent across Unix/Linux, Windows, and MacOS X.
+TkDiff is included for browsing and merging your changes.
 
 It shows the status of the files in the current working directory, and
 has tools for tagging, merging, importing, exporting, checking in/out,
diff --git a/devel/tkcvs/pkg-message b/devel/tkcvs/pkg-message
new file mode 100644
index 000000000000..9d00d7a2bcea
--- /dev/null
+++ b/devel/tkcvs/pkg-message
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOM
+IMPORTANT
+
+There are new freatures and additions in this version.
+
+Please see /usr/local/share/doc/tkcvs/INSTALL
+for important configuration options.
+EOM
+}
+]
diff --git a/devel/tkcvs/pkg-plist b/devel/tkcvs/pkg-plist
index 258ef12bad4e..21706f965bf1 100644
--- a/devel/tkcvs/pkg-plist
+++ b/devel/tkcvs/pkg-plist
@@ -6,9 +6,8 @@ lib/tkcvs/bitmaps/amod.gif
 lib/tkcvs/bitmaps/anglerfish_med.gif
 lib/tkcvs/bitmaps/annotate.gif
 lib/tkcvs/bitmaps/annotate.xbm
+lib/tkcvs/bitmaps/arr_dn_picklist.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/branch.gif
 lib/tkcvs/bitmaps/branch.xbm
@@ -19,17 +18,22 @@ lib/tkcvs/bitmaps/checkout.gif
 lib/tkcvs/bitmaps/checkout_opts.gif
 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/delta_feather.gif
 lib/tkcvs/bitmaps/diff.gif
+lib/tkcvs/bitmaps/difflines.gif
 lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/dir_cvs.gif
+lib/tkcvs/bitmaps/dir_git.gif
 lib/tkcvs/bitmaps/dir_minus.gif
-lib/tkcvs/bitmaps/dir_new.gif
+lib/tkcvs/bitmaps/dir_mod.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/dir_rcs.gif
+lib/tkcvs/bitmaps/dir_svn.gif
 lib/tkcvs/bitmaps/dirbranch.gif
 lib/tkcvs/bitmaps/dirbranch.xbm
 lib/tkcvs/bitmaps/edit.gif
@@ -37,9 +41,12 @@ 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/folder_new.gif
 lib/tkcvs/bitmaps/folderopen.gif
+lib/tkcvs/bitmaps/git_checkin.gif
+lib/tkcvs/bitmaps/git_checkout.gif
 lib/tkcvs/bitmaps/import.gif
+lib/tkcvs/bitmaps/lightning.gif
 lib/tkcvs/bitmaps/link.gif
 lib/tkcvs/bitmaps/link_mod.gif
 lib/tkcvs/bitmaps/link_modml.gif
@@ -58,12 +65,12 @@ lib/tkcvs/bitmaps/mdir.gif
 lib/tkcvs/bitmaps/mod.gif
 lib/tkcvs/bitmaps/modbrowse.gif
 lib/tkcvs/bitmaps/modbrowse_cvs.gif
+lib/tkcvs/bitmaps/modbrowse_git.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/patchfile.gif
-lib/tkcvs/bitmaps/rcsdir.gif
 lib/tkcvs/bitmaps/rdiff.gif
 lib/tkcvs/bitmaps/remove.gif
 lib/tkcvs/bitmaps/stat_conf.gif
@@ -72,19 +79,21 @@ 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_mod_green.gif
+lib/tkcvs/bitmaps/stat_mod_red.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_oodml.gif
 lib/tkcvs/bitmaps/stat_plus.gif
 lib/tkcvs/bitmaps/stat_plus_kb.gif
 lib/tkcvs/bitmaps/stat_ques.gif
-lib/tkcvs/bitmaps/svndir.gif
 lib/tkcvs/bitmaps/tag.gif
 lib/tkcvs/bitmaps/tags.gif
-lib/tkcvs/bitmaps/ticklefish48.gif
+lib/tkcvs/bitmaps/ticklefish64.gif
 lib/tkcvs/bitmaps/ticklefish_med.gif
 lib/tkcvs/bitmaps/tkcvs-help.xbm
 lib/tkcvs/bitmaps/tkcvs48.xbm
@@ -102,14 +111,16 @@ lib/tkcvs/errors.tcl
 lib/tkcvs/exec.tcl
 lib/tkcvs/filebrowse.tcl
 lib/tkcvs/gen_log.tcl
+lib/tkcvs/git.tcl
 lib/tkcvs/help.tcl
 lib/tkcvs/import.tcl
 lib/tkcvs/import2.tcl
 lib/tkcvs/joincanvas.tcl
+lib/tkcvs/load_images.tcl
+lib/tkcvs/menubar.tcl
 lib/tkcvs/modbrowse.tcl
-lib/tkcvs/modtree.tcl
 lib/tkcvs/modules.tcl
-lib/tkcvs/picklist.tcl
+lib/tkcvs/preferences.tcl
 lib/tkcvs/rcs.tcl
 lib/tkcvs/style_params.tcl
 lib/tkcvs/svn-import.tcl
@@ -121,7 +132,8 @@ lib/tkcvs/tooltips.tcl
 lib/tkcvs/ui_misc.tcl
 lib/tkcvs/vendor_merge.tcl
 lib/tkcvs/workdir.tcl
-share/man/man1/tkcvs.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
+share/man/man1/tkcvs.1.gz
+share/pixmaps/tkcvs.png