diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index a53013eb8ff..534485821e9 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2003/10/26 19:13:05 sturm Exp $
+# $OpenBSD: Makefile,v 1.22 2003/12/27 23:30:05 jose Exp $
 
 COMMENT=		"Tcl/Tk interface to the MH mail system"
 
@@ -16,11 +16,11 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_TCLTK:=exmh/}
 
-BUILD_DEPENDS=		:tcl-8.3.*:lang/tcl/8.3
+BUILD_DEPENDS=		:tcl-8.4.*:lang/tcl/8.4
 RUN_DEPENDS=		:expect-*:lang/expect\
 			:nmh-*:mail/nmh\
 			:metamail-*:mail/metamail\
-			:tk-8.3.*:x11/tk/8.3
+			:tk-8.4.*:x11/tk/8.4
 USE_X11=		Yes
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
@@ -36,7 +36,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/exmh
 	cp -r ${WRKSRC}/lib/. ${PREFIX}/share/exmh
 	cd ${PREFIX}/share && echo 'auto_mkindex exmh'\
-		| ${LOCALBASE}/bin/tclsh8.3
+		| ${LOCALBASE}/bin/tclsh8.4
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/exmh
 	find ${PREFIX}/share/exmh -type d -print0 | xargs -0 chmod ${DIRMODE}
 	find ${PREFIX}/share/exmh -type f -print0 | xargs -0 chmod ${SHAREMODE}
diff --git a/mail/exmh2/scripts/configure b/mail/exmh2/scripts/configure
index 5cbe43fe505..ebbf364fbcf 100755
--- a/mail/exmh2/scripts/configure
+++ b/mail/exmh2/scripts/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Configuration script for exmh-2.6.1.
-# $OpenBSD: configure,v 1.3 2003/04/16 08:40:59 wilfried Exp $
+# $OpenBSD: configure,v 1.4 2003/12/27 23:30:05 jose Exp $
 #
 
 perl << 'EOPERL'
@@ -21,7 +21,7 @@ my $localbase = exists $ENV{"LOCALBASE"} ? $ENV{"LOCALBASE"} : "/usr/local";
 my $config = "
 # Saved state from exmh.install
 # Fri Apr  4 10:35:26 EST 2003
-set wish $localbase/bin/wish8.3
+set wish $localbase/bin/wish8.4
 set exmh(version) {version 2.6.1 02/18/2003}
 set exmh(name) exmh
 set exmh(maintainer) welch\@acm.org
@@ -66,8 +66,8 @@ while (my $name = $dir->read ()){
 
 	if (my $line = $in->getline ()){
 		$line =~ s|^#!expect|#!$localbase/bin/expect|;
-		$line =~ s|^#!tclsh|#!$localbase/bin/tclsh8.3|;
-		$line =~ s|^#!wish|#!$localbase/bin/wish8.3|;
+		$line =~ s|^#!tclsh|#!$localbase/bin/tclsh8.4|;
+		$line =~ s|^#!wish|#!$localbase/bin/wish8.4|;
 		$out->print ($line) or die ("$dst: $!\n");
 
 		while ($line = $in->getline ()){
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index e01ea34d5ac..5614bebba7f 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/03/31 04:33:59 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.2 2003/12/27 23:31:39 jose Exp $
 
 COMMENT=		"GPL computer algebra system based on DOE Macsyma"
 
@@ -29,9 +29,9 @@ FLAVOR?=
 CONFIGURE_ARGS+=	--enable-clisp 
 .if !${FLAVOR:L:Mno_x11}
 USE_X11=		Yes
-LIB_DEPENDS+= 		tcl83.1.3::lang/tcl/8.3 \
-			tk83.1.3::x11/tk/8.3 
-CONFIGURE_ARGS+=	--with-wish=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS+= 		tcl84::lang/tcl/8.4 \
+			tk84::x11/tk/8.4 
+CONFIGURE_ARGS+=	--with-wish=${LOCALBASE}/bin/wish8.4
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/tclcurl/Makefile b/net/tclcurl/Makefile
index 75c086ad8c8..10160c384d4 100644
--- a/net/tclcurl/Makefile
+++ b/net/tclcurl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2003/08/12 02:20:31 jose Exp $
+# $OpenBSD: Makefile,v 1.2 2003/12/27 23:32:42 jose Exp $
 
 COMMENT=		"Tcl bindings for Curl"
 NOT_FOR_ARCHS= 		${NO_SHARED_ARCHS}
@@ -19,11 +19,11 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${HOMEPAGE}download/tarball/
 
 LIB_DEPENDS=    	curl.2.2::net/curl \
-			tcl83.1.3::lang/tcl/8.3
+			tcl84::lang/tcl/8.4
 
 CONFIGURE_STYLE=	gnu dest
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.3 \
-			--with-tclinclude=${LOCALBASE}/include/tcl8.3/ 
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
+			--with-tclinclude=${LOCALBASE}/include/tcl8.4/ 
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 
 # broken in this version
@@ -33,14 +33,14 @@ NO_REGRESS=		Yes
 MAN_FILES=		tclcurl.n tclcurl_multi.n
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl8.3/tclcurl0.105
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl8.4/tclcurl0.105
 	${INSTALL_DATA} ${WRKDIST}/libtclcurl0105.so \
-		${PREFIX}/lib/tcl8.3/tclcurl0.105
+		${PREFIX}/lib/tcl8.4/tclcurl0.105
 	${INSTALL_DATA} ${WRKDIST}/generic/tclcurl.tcl \
-		${PREFIX}/lib/tcl8.3/tclcurl0.105
+		${PREFIX}/lib/tcl8.4/tclcurl0.105
 	${INSTALL_MAN_DIR} ${PREFIX}/man/mann
 	${INSTALL_DATA} ${WRKDIST}/pkgIndex.tcl \
-		${PREFIX}/lib/tcl8.3/tclcurl0.105
+		${PREFIX}/lib/tcl8.4/tclcurl0.105
 .for file in ${MAN_FILES}
 	${INSTALL_DATA} ${WRKDIST}/doc/${file} ${PREFIX}/man/mann
 .endfor
diff --git a/net/tclcurl/pkg/PLIST b/net/tclcurl/pkg/PLIST
index 8a7ce7d0e21..81cd4eb83ba 100644
--- a/net/tclcurl/pkg/PLIST
+++ b/net/tclcurl/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1 2003/08/12 02:20:31 jose Exp $
-lib/tcl8.3/tclcurl0.105/libtclcurl0105.so
-lib/tcl8.3/tclcurl0.105/pkgIndex.tcl
-lib/tcl8.3/tclcurl0.105/tclcurl.tcl
+@comment $OpenBSD: PLIST,v 1.2 2003/12/27 23:32:42 jose Exp $
+lib/tcl8.4/tclcurl0.105/libtclcurl0105.so
+lib/tcl8.4/tclcurl0.105/pkgIndex.tcl
+lib/tcl8.4/tclcurl0.105/tclcurl.tcl
 man/mann/tclcurl.n
 man/mann/tclcurl_multi.n
-@dirrm lib/tcl8.3/tclcurl0.105
+@dirrm lib/tcl8.4/tclcurl0.105
diff --git a/textproc/TclXML/Makefile b/textproc/TclXML/Makefile
index ee8ed5ebabc..4f197a8522f 100644
--- a/textproc/TclXML/Makefile
+++ b/textproc/TclXML/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2003/11/15 15:12:53 sturm Exp $
+# $OpenBSD: Makefile,v 1.14 2003/12/27 23:33:12 jose Exp $
 
 COMMENT=	"pure-Tcl implementation of XML parser"
 
@@ -15,12 +15,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	:tcl-8.3.*:lang/tcl/8.3
+RUN_DEPENDS=	:tcl-8.4.*:lang/tcl/8.4
 
 NO_BUILD=       Yes
 NO_REGRESS=	Yes
 
-INSTDIR=	${PREFIX}/lib/tcl8.3/TclXML
+INSTDIR=	${PREFIX}/lib/tcl8.4/TclXML
 DOCDIR=		${PREFIX}/share/doc/TclXML
 
 do-install:
diff --git a/textproc/TclXML/pkg/PLIST b/textproc/TclXML/pkg/PLIST
index a13f686ba3a..374c6a78461 100644
--- a/textproc/TclXML/pkg/PLIST
+++ b/textproc/TclXML/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/04/07 01:54:53 naddy Exp $
-lib/tcl8.3/TclXML/pkgIndex.tcl
-lib/tcl8.3/TclXML/sgml.tcl
-lib/tcl8.3/TclXML/xml.tcl
+@comment $OpenBSD: PLIST,v 1.4 2003/12/27 23:33:12 jose Exp $
+lib/tcl8.4/TclXML/pkgIndex.tcl
+lib/tcl8.4/TclXML/sgml.tcl
+lib/tcl8.4/TclXML/xml.tcl
 share/doc/TclXML/reference.html
-@dirrm lib/tcl8.3/TclXML
 @dirrm share/doc/TclXML
+@dirrm lib/tcl8.4/TclXML