Upgrade to tkcon-2.1:

	. replace one of the hunks with a regex
	. use tk83
	. handle NOPORTDOCS in pkg-plist

Approved by: maintainer

4 files changed, 31 insertions, 37 deletions

diff --git a/devel/tkcon/Makefile b/devel/tkcon/Makefile
index 91fe1c35bd1f..ae826c97ebf6 100644
--- a/devel/tkcon/Makefile
+++ b/devel/tkcon/Makefile
@@ -6,24 +6,26 @@
 #
 
 PORTNAME=	tkcon
-PORTVERSION=	1.6
-CATEGORIES=	devel tk82
-MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/sorted/packages-8.0/devel/
+PORTVERSION=	2.1
+CATEGORIES=	devel tk83
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=${PORTNAME}
 
 MAINTAINER=	gehicks@cisco.com
 
-RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
+RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 
 NO_BUILD=	yes
 
 post-patch:
-	@${PERL} -pi -e 's:/usr/local:${PREFIX}:' ${WRKSRC}/tkcon.tcl
+	@${PERL} -pi \
+		-e 's,docs\s+"([^"]+)",docs	"file:${PREFIX}/share/doc/tkcon/index.html\\n\1",' ${WRKSRC}/tkcon.tcl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tkcon.tcl ${PREFIX}/bin/tkcon
 
-post-install:
 .if !defined(NOPORTDOCS)
+post-install:
 	${MKDIR} ${PREFIX}/share/doc/tkcon
 	${INSTALL_DATA} ${WRKSRC}/README.txt $(PREFIX)/share/doc/tkcon/README.tkcon
 	${INSTALL_DATA} ${WRKSRC}/docs/* $(PREFIX)/share/doc/tkcon
diff --git a/devel/tkcon/distinfo b/devel/tkcon/distinfo
index 10c8c742906a..6262db6c1c00 100644
--- a/devel/tkcon/distinfo
+++ b/devel/tkcon/distinfo
@@ -1 +1 @@
-MD5 (tkcon-1.6.tar.gz) = 3fe992642ddd27f3ea21548b1b26ab61
+MD5 (tkcon-2.1.tar.gz) = 282934611594adfd580f71b760e72efe
diff --git a/devel/tkcon/files/patch-aa b/devel/tkcon/files/patch-aa
index f547f6a9c0cc..f6608c1dd771 100644
--- a/devel/tkcon/files/patch-aa
+++ b/devel/tkcon/files/patch-aa
@@ -1,19 +1,10 @@
---- tkcon.tcl.orig	Thu Apr  1 05:49:22 1999
+--- tkcon.tcl	Thu Apr  1 05:49:22 1999
 +++ tkcon.tcl	Mon Jun 28 21:35:52 1999
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # \
 -exec wish "$0" ${1+"$@"}
-+if [ X$WISH != X ]; then exec $WISH "$0" -- "$@"; else exec wish8.2 "$0" -- "$@"; fi;
++if [ X$WISH != X ]; then exec $WISH "$0" -- "$@"; else exec wish8.3 "$0" -- "$@"; fi;
  
  #
  ## tkcon.tcl
-@@ -133,7 +133,7 @@
- 	}
- 	version		1.6
- 	release		{31 March 1999}
--	docs		"http://www.purl.org/net/hobbs/tcl/script/tkcon/\nhttp://www.hobbs.wservice.com/tcl/script/tkcon/"
-+	docs		"file:/usr/local/share/doc/tkcon/\nhttp://www.hobbs.wservice.com/tcl/script/tkcon/"
- 	email		{jeff.hobbs@acm.org}
- 	root		.
-     }
diff --git a/devel/tkcon/pkg-plist b/devel/tkcon/pkg-plist
index 7a287a637113..e7841ff5b80d 100644
--- a/devel/tkcon/pkg-plist
+++ b/devel/tkcon/pkg-plist
@@ -1,20 +1,21 @@
 bin/tkcon
-share/doc/tkcon/README.tkcon
-share/doc/tkcon/bindings.html
-share/doc/tkcon/changes.txt
-share/doc/tkcon/demopic.gif
-share/doc/tkcon/dump.html
-share/doc/tkcon/idebug.html
-share/doc/tkcon/index.html
-share/doc/tkcon/license.terms
-share/doc/tkcon/limits.html
-share/doc/tkcon/nontcl.html
-share/doc/tkcon/observe.html
-share/doc/tkcon/perl.txt
-share/doc/tkcon/plugin.html
-share/doc/tkcon/procs.html
-share/doc/tkcon/purpose.html
-share/doc/tkcon/start.html
-share/doc/tkcon/tkcon.html
-share/doc/tkcon/todo.html
-@dirrm share/doc/tkcon
+%%PORTDOCS%%share/doc/tkcon/README.tkcon
+%%PORTDOCS%%share/doc/tkcon/bindings.html
+%%PORTDOCS%%share/doc/tkcon/changes.txt
+%%PORTDOCS%%share/doc/tkcon/demopic.gif
+%%PORTDOCS%%share/doc/tkcon/dump.html
+%%PORTDOCS%%share/doc/tkcon/idebug.html
+%%PORTDOCS%%share/doc/tkcon/index.html
+%%PORTDOCS%%share/doc/tkcon/license.terms
+%%PORTDOCS%%share/doc/tkcon/limits.html
+%%PORTDOCS%%share/doc/tkcon/nontcl.html
+%%PORTDOCS%%share/doc/tkcon/observe.html
+%%PORTDOCS%%share/doc/tkcon/perl.txt
+%%PORTDOCS%%share/doc/tkcon/plugin.html
+%%PORTDOCS%%share/doc/tkcon/procs.html
+%%PORTDOCS%%share/doc/tkcon/purpose.html
+%%PORTDOCS%%share/doc/tkcon/start.html
+%%PORTDOCS%%share/doc/tkcon/tkcon.html
+%%PORTDOCS%%share/doc/tkcon/todo.html
+%%PORTDOCS%%share/doc/tkcon/style.css
+%%PORTDOCS%%@dirrm share/doc/tkcon