3 files changed, 57 insertions, 50 deletions
diff --git a/lang/tcltutor/Makefile b/lang/tcltutor/Makefile
index b1ab4b784c75..8545f54599b9 100644
--- a/lang/tcltutor/Makefile
+++ b/lang/tcltutor/Makefile
@@ -7,16 +7,21 @@
 
 PORTNAME=	tcltutor
 PORTVERSION=	2.b.4
-CATEGORIES=	lang tk83 tcl83
+CATEGORIES=	lang tk84 tcl84
 MASTER_SITES=	http://www.msen.com/~clif/
 DISTNAME=	Tutor2b4
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	A Tcl/Tk based tutorial for Tcl
 
-RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
+RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
 WRKSRC=		${WRKDIR}/TclTutor
 NO_BUILD=	yes
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/tcltutor/TclTutor/}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/help.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/about.html ${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/tcltutor/files/patch-aa b/lang/tcltutor/files/patch-aa
index 4480f126a413..c137d5104014 100644
--- a/lang/tcltutor/files/patch-aa
+++ b/lang/tcltutor/files/patch-aa
@@ -15,7 +15,7 @@
  #!/bin/sh 
  # \
 -exec wish "$0" "$@"
-+exec wish8.3 "$0" "$@"
++exec wish8.4 "$0" "$@"
  
  ;# NAME:   TclTutor.tcl
  ;# AUTHOR: Clif Flynt
@@ -34,7 +34,7 @@
  #!/bin/sh
  # \
 -exec wish "$0" ${1+"$@"}
-+exec wish8.3 "$0" ${1+"$@"}
++exec wish8.4 "$0" ${1+"$@"}
         
  # CONFIGURATION DETAIL: SET THIS FOR YOUR IMAGE VIEWER:
  #  (xli, xv, ee, etc)
diff --git a/lang/tcltutor/pkg-plist b/lang/tcltutor/pkg-plist
index fd6658f6ad80..bd9e3a04aafe 100644
--- a/lang/tcltutor/pkg-plist
+++ b/lang/tcltutor/pkg-plist
@@ -1,49 +1,51 @@
 bin/TclTutor.tcl
 bin/scaler.tcl
 bin/htmllib.tcl
-share/doc/TclTutor/Tcl0.lsn
-share/doc/TclTutor/Tcl1.lsn
-share/doc/TclTutor/Tcl2.lsn
-share/doc/TclTutor/Tcl3.lsn
-share/doc/TclTutor/Tcl4.lsn
-share/doc/TclTutor/Tcl5.lsn
-share/doc/TclTutor/Tcl6.lsn
-share/doc/TclTutor/Tcl7.lsn
-share/doc/TclTutor/Tcl8.lsn
-share/doc/TclTutor/Tcl9.lsn
-share/doc/TclTutor/Tcl10.lsn
-share/doc/TclTutor/Tcl11.lsn
-share/doc/TclTutor/Tcl12.lsn
-share/doc/TclTutor/Tcl13.lsn
-share/doc/TclTutor/Tcl14.lsn
-share/doc/TclTutor/Tcl15.lsn
-share/doc/TclTutor/Tcl16.lsn
-share/doc/TclTutor/Tcl17.lsn
-share/doc/TclTutor/Tcl18.lsn
-share/doc/TclTutor/Tcl19.lsn
-share/doc/TclTutor/Tcl20.lsn
-share/doc/TclTutor/Tcl21.lsn
-share/doc/TclTutor/Tcl22.lsn
-share/doc/TclTutor/Tcl23.lsn
-share/doc/TclTutor/Tcl24.lsn
-share/doc/TclTutor/Tcl25.lsn
-share/doc/TclTutor/Tcl26.lsn
-share/doc/TclTutor/Tcl27.lsn
-share/doc/TclTutor/Tcl28.lsn
-share/doc/TclTutor/Tcl29.lsn
-share/doc/TclTutor/Tcl30.lsn
-share/doc/TclTutor/Tcl31.lsn
-share/doc/TclTutor/Tcl32.lsn
-share/doc/TclTutor/Tcl33.lsn
-share/doc/TclTutor/Tcl34.lsn
-share/doc/TclTutor/Tcl35.lsn
-share/doc/TclTutor/Tcl36.lsn
-share/doc/TclTutor/Tcl37.lsn
-share/doc/TclTutor/Tcl38.lsn
-share/doc/TclTutor/Tcl39.lsn
-share/doc/TclTutor/Tcl40.lsn
-share/doc/TclTutor/Tcl41.lsn
-share/doc/TclTutor/Tcl42.lsn
-share/doc/TclTutor/Tcl43.lsn
-share/doc/TclTutor/Tcl.cfg
-@dirrm share/doc/TclTutor
+%%DOCSDIR%%/help.html
+%%DOCSDIR%%/about.html
+%%DOCSDIR%%/Tcl0.lsn
+%%DOCSDIR%%/Tcl1.lsn
+%%DOCSDIR%%/Tcl2.lsn
+%%DOCSDIR%%/Tcl3.lsn
+%%DOCSDIR%%/Tcl4.lsn
+%%DOCSDIR%%/Tcl5.lsn
+%%DOCSDIR%%/Tcl6.lsn
+%%DOCSDIR%%/Tcl7.lsn
+%%DOCSDIR%%/Tcl8.lsn
+%%DOCSDIR%%/Tcl9.lsn
+%%DOCSDIR%%/Tcl10.lsn
+%%DOCSDIR%%/Tcl11.lsn
+%%DOCSDIR%%/Tcl12.lsn
+%%DOCSDIR%%/Tcl13.lsn
+%%DOCSDIR%%/Tcl14.lsn
+%%DOCSDIR%%/Tcl15.lsn
+%%DOCSDIR%%/Tcl16.lsn
+%%DOCSDIR%%/Tcl17.lsn
+%%DOCSDIR%%/Tcl18.lsn
+%%DOCSDIR%%/Tcl19.lsn
+%%DOCSDIR%%/Tcl20.lsn
+%%DOCSDIR%%/Tcl21.lsn
+%%DOCSDIR%%/Tcl22.lsn
+%%DOCSDIR%%/Tcl23.lsn
+%%DOCSDIR%%/Tcl24.lsn
+%%DOCSDIR%%/Tcl25.lsn
+%%DOCSDIR%%/Tcl26.lsn
+%%DOCSDIR%%/Tcl27.lsn
+%%DOCSDIR%%/Tcl28.lsn
+%%DOCSDIR%%/Tcl29.lsn
+%%DOCSDIR%%/Tcl30.lsn
+%%DOCSDIR%%/Tcl31.lsn
+%%DOCSDIR%%/Tcl32.lsn
+%%DOCSDIR%%/Tcl33.lsn
+%%DOCSDIR%%/Tcl34.lsn
+%%DOCSDIR%%/Tcl35.lsn
+%%DOCSDIR%%/Tcl36.lsn
+%%DOCSDIR%%/Tcl37.lsn
+%%DOCSDIR%%/Tcl38.lsn
+%%DOCSDIR%%/Tcl39.lsn
+%%DOCSDIR%%/Tcl40.lsn
+%%DOCSDIR%%/Tcl41.lsn
+%%DOCSDIR%%/Tcl42.lsn
+%%DOCSDIR%%/Tcl43.lsn
+%%DOCSDIR%%/Tcl.cfg
+@dirrm %%DOCSDIR%%