- Update to version 8.2.3

PR:		164154
Submitted by:	Ports Fury

3 files changed, 46 insertions, 23 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 1459dec6e45d..73ff0880be30 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -6,33 +6,40 @@
 #
 
 PORTNAME=	tkcvs
-PORTVERSION=	8.2
+PORTVERSION=	8.2.3
 CATEGORIES=	devel
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}
+MASTER_SITES=	SF \
+		http://www.twobarleycorns.net/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Tcl/Tk frontends to CVS, Subversion and diff
+COMMENT=	Tcl/Tk frontends to CVS and Subversion
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	tkdiff:${PORTSDIR}/textproc/tkdiff
 
 NO_BUILD=	yes
-USE_TK_RUN=	84
+
+USE_TCL_WRAPPER=yes
+USE_TK_WRAPPER=	yes
 
 MAN1=		tkcvs.1
-PORTDOCS=	CHANGELOG COPYING FAQ INSTALL vendor5readme.pdf
-PATCH_TCL_SCRIPTS=	doinstall.tcl tkcvs/mkindex
-PATCH_TK_SCRIPTS=	doinstall.tcl tkcvs/tkcvs.tcl tkdiff/tkdiff
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/tkcvs/tkcvs.tcl ${PREFIX}/bin/tkcvs
-	@${INSTALL_SCRIPT} ${WRKSRC}/tkdiff/tkdiff ${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/tkcvs/tkcvs.1 ${MAN1PREFIX}/man/man1/
-	@${INSTALL} -d ${PREFIX}/lib/tkcvs/bitmaps/
-	@${INSTALL_DATA} ${WRKSRC}/tkcvs/*tcl ${PREFIX}/lib/tkcvs/
-	@${INSTALL_DATA} ${WRKSRC}/tkcvs/tclIndex ${PREFIX}/lib/tkcvs/
-	@${INSTALL_DATA} ${WRKSRC}/tkcvs/bitmaps/* ${PREFIX}/lib/tkcvs/bitmaps/
+	${INSTALL_SCRIPT} ${WRKSRC}/tkcvs/tkcvs ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/tkcvs/tkcvs.1 ${MAN1PREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/lib/tkcvs
+	${INSTALL_DATA} ${WRKSRC}/tkcvs/*.tcl ${PREFIX}/lib/tkcvs
+	${INSTALL_DATA} ${WRKSRC}/tkcvs/tclIndex ${PREFIX}/lib/tkcvs
+	@${MKDIR} ${PREFIX}/lib/tkcvs/bitmaps
+	${INSTALL_DATA} ${WRKSRC}/tkcvs/bitmaps/*.gif ${PREFIX}/lib/tkcvs/bitmaps
+	${INSTALL_DATA} ${WRKSRC}/tkcvs/bitmaps/*.xbm ${PREFIX}/lib/tkcvs/bitmaps
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	@${MKDIR} ${DOCSDIR}
+.for file in CHANGELOG.txt FAQ.txt INSTALL
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 986474375f92..2175b32447b1 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tkcvs_8_2.tar.gz) = 99fb93e97c191a0adf98f4c23ae6697d92ed727666bb5d910d504cd324722233
-SIZE (tkcvs_8_2.tar.gz) = 1168611
+SHA256 (tkcvs-8.2.3.tar.gz) = 4bfb29dd9ffbbbc1e6e611e1c772af745d742d336e797bf056dbf70116b8e32a
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
diff --git a/devel/tkcvs/pkg-plist b/devel/tkcvs/pkg-plist
index a8e580f442e3..e5f02f5eaf41 100644
--- a/devel/tkcvs/pkg-plist
+++ b/devel/tkcvs/pkg-plist
@@ -1,8 +1,5 @@
 bin/tkcvs
-bin/tkdiff
 lib/tkcvs/annotate.tcl
-lib/tkcvs/bitmaps/Anglerfish.icns
-lib/tkcvs/bitmaps/Ticklefish.icns
 lib/tkcvs/bitmaps/add.gif
 lib/tkcvs/bitmaps/adir.gif
 lib/tkcvs/bitmaps/amod.gif
@@ -30,6 +27,7 @@ lib/tkcvs/bitmaps/dir.gif
 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
@@ -42,6 +40,15 @@ lib/tkcvs/bitmaps/fileview.gif
 lib/tkcvs/bitmaps/folder.gif
 lib/tkcvs/bitmaps/folderopen.gif
 lib/tkcvs/bitmaps/import.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
@@ -65,7 +72,11 @@ 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
@@ -73,6 +84,7 @@ 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/ticklefish_med.gif
 lib/tkcvs/bitmaps/tkcvs-help.xbm
 lib/tkcvs/bitmaps/tkcvs48.xbm
@@ -82,7 +94,6 @@ lib/tkcvs/bitmaps/unlocked.gif
 lib/tkcvs/bitmaps/updir.gif
 lib/tkcvs/bitmaps/who.gif
 lib/tkcvs/branch_diagram.tcl
-lib/tkcvs/cde_params.tcl
 lib/tkcvs/cvs.tcl
 lib/tkcvs/dialog.tcl
 lib/tkcvs/diff.tcl
@@ -100,6 +111,7 @@ lib/tkcvs/modtree.tcl
 lib/tkcvs/modules.tcl
 lib/tkcvs/picklist.tcl
 lib/tkcvs/rcs.tcl
+lib/tkcvs/style_params.tcl
 lib/tkcvs/svn-import.tcl
 lib/tkcvs/svn.tcl
 lib/tkcvs/tclIndex
@@ -109,5 +121,9 @@ lib/tkcvs/tooltips.tcl
 lib/tkcvs/ui_misc.tcl
 lib/tkcvs/vendor_merge.tcl
 lib/tkcvs/workdir.tcl
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/tkcvs/bitmaps
 @dirrm lib/tkcvs