Replace lang/tcl with lang/tcl83. Packages compatible with 8.4 will

be updated to depend on lang/tcl after Tcl/Tk update.

45 files changed, 95 insertions, 94 deletions

diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 2bca59a107d..73d3f0cdddb 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/28 12:54:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:52:50 minskim Exp $
 
 DISTNAME=	rosegarden-2.1pl4
 PKGNAME=	rosegarden-2.1.4
@@ -19,5 +19,5 @@ USE_X11=	YES
 post-extract:
 	cd ${WRKSRC} && ${MV} Rosegarden Rosegarden.in
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 2051ac5e958..9d058f24cc6 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:09:10 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:52:50 minskim Exp $
 
 DISTNAME=	xcircuit-3.1.19
 CATEGORIES=	cad graphics
@@ -32,6 +32,6 @@ post-install:
 
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index 4dca559228e..1d9961874e9 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:25:36 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 19:52:50 minskim Exp $
 #
 
 DISTNAME=	eggdrop1.6.15
@@ -66,7 +66,7 @@ do-install-program:
 	cd ${WRKSRC}/scripts && ${INSTALL_DATA} CONTENTS *.tcl autobotchk \
 		 botchk weed ${PREFIX}/share/eggdrop/scripts/
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if defined(NOPIC)
diff --git a/chat/i2cb/Makefile b/chat/i2cb/Makefile
index 856c29af03d..b5b486d75f5 100644
--- a/chat/i2cb/Makefile
+++ b/chat/i2cb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:09:35 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 19:52:50 minskim Exp $
 #
 
 DISTNAME=	i2cb-6.0_ALPHA
@@ -28,6 +28,6 @@ do-install:
 		${WRKSRC}/contrib/echofile \
 		${PREFIX}/libdata/i2cb
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 739a72d1ca7..819d4415c3e 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/01/22 07:51:12 grant Exp $
+# $NetBSD: Makefile,v 1.34 2004/03/08 19:52:50 minskim Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
@@ -36,7 +36,7 @@ post-patch:
 .include "../../devel/readline/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index 0b81dc3ea58..e12ddfa7034 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 14:11:50 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 19:52:50 minskim Exp $
 
 PKGNAME=		postgresql-pltcl-${BASE_VERS}
 PKGREVISION=		1
@@ -19,6 +19,6 @@ TCLSH=			${LOCALBASE}/bin/tclsh
 BUILD_DIRS=		${WRKSRC}/src/pl/tcl
 
 .include "../postgresql-lib/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-fbsql/Makefile b/databases/tcl-fbsql/Makefile
index 4166fda06ee..46a221e7ad6 100644
--- a/databases/tcl-fbsql/Makefile
+++ b/databases/tcl-fbsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/03 14:19:05 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 19:52:50 minskim Exp $
 
 DISTNAME=		fbsql.c
 PKGNAME=		tcl-fbsql-1.05
@@ -25,7 +25,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fbsql.so ${TCL_DIR}
 
 .include "../../databases/mysql-client/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .ifmake do-install
diff --git a/databases/tcl-gdbm/Makefile b/databases/tcl-gdbm/Makefile
index 4160f7fe890..82d4c67434f 100644
--- a/databases/tcl-gdbm/Makefile
+++ b/databases/tcl-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:29:07 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/08 19:52:50 minskim Exp $
 #
 
 DISTNAME=	tclgdbm-0.8
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.graphviz.org/pub/tclgdbm/
 MAINTAINER=	bouyer@NetBSD.org
 COMMENT=	Tcl interface to gdbm - GNU database manager
 
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
+DEPENDS+=	tcl>=8.3.2:../../lang/tcl83
 DEPENDS+=	gdbm>=1.8.3:../../databases/gdbm
 
 GNU_CONFIGURE=		# defined
diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile
index cabde011092..5b72cde62a6 100644
--- a/databases/tcl-postgresql/Makefile
+++ b/databases/tcl-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/20 14:11:50 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/08 19:52:50 minskim Exp $
 
 PKGNAME=		tcl-postgresql-${BASE_VERS}
 PKGREVISION=		1
@@ -23,6 +23,6 @@ post-install:
 		`${SED} -e "s|#.*||" ${FILESDIR}/man.tcl`
 
 .include "../postgresql-lib/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-postgresql/buildlink2.mk b/databases/tcl-postgresql/buildlink2.mk
index 73a6f65a92f..a0c7993a404 100644
--- a/databases/tcl-postgresql/buildlink2.mk
+++ b/databases/tcl-postgresql/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/05 20:12:29 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/08 19:52:50 minskim Exp $
 
 .if !defined(TCL_POSTGRESQL_BUILDLINK2_MK)
 TCL_POSTGRESQL_BUILDLINK2_MK=	# defined
@@ -12,7 +12,7 @@ BUILDLINK_PREFIX.tcl-postgresql_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.tcl-postgresql=		include/pgsql/libpgtcl.h
 BUILDLINK_FILES.tcl-postgresql+=	lib/libpgtcl.*
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	tcl-postgresql-buildlink
 
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 82444937b20..d314d773cc4 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/22 08:24:29 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:52:51 minskim Exp $
 
 DISTNAME=		gcvs-1.0a7
 PKGREVISION=		2
@@ -21,7 +21,7 @@ INFO_FILES=		cvs.info cvsclient.info
 CONFIGURE_ARGS+=	--with-tclinclude="${BUILDLINK_PREFIX.tcl}/include" \
 			--with-tcllib="${BUILDLINK_PREFIX.tcl}/lib"
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 67e8e230e46..bfe406f11ce 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/14 05:09:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=		libstroke-0.3
@@ -19,5 +19,5 @@ USE_BUILDLINK3=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libstroke/buildlink2.mk b/devel/libstroke/buildlink2.mk
index 816a317f3f6..64961f62e31 100644
--- a/devel/libstroke/buildlink2.mk
+++ b/devel/libstroke/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/12/13 03:21:38 dmcmahill Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/08 19:52:51 minskim Exp $
 #
 # This Makefile fragment is included by packages that use libstroke.
 #
@@ -17,7 +17,7 @@ BUILDLINK_PREFIX.libstroke_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libstroke+=	lib/libstroke.*
 BUILDLINK_FILES.libstroke+=	lib/libstroke_tcl.*
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libstroke-buildlink
 
diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk
index b7b1e9a4f19..e73fd4ed531 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/08 19:52:51 minskim Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSTROKE_BUILDLINK3_MK:=	${LIBSTROKE_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	libstroke
 BUILDLINK_DEPENDS.libstroke+=	libstroke>=0.3nb1
 BUILDLINK_PKGSRCDIR.libstroke?=	../../devel/libstroke
 
-.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
 
 .endif	# LIBSTROKE_BUILDLINK3_MK
 
diff --git a/devel/stooop/Makefile b/devel/stooop/Makefile
index 6d6265133fb..c92e559f4c5 100644
--- a/devel/stooop/Makefile
+++ b/devel/stooop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:34:07 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 19:52:51 minskim Exp $
 
 DISTNAME=	stooop-4.1.1
 CATEGORIES=	x11 tcl
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://jfontain.free.fr/
 COMMENT=	Simple Tcl Only Object Oriented Programming scheme
 
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
+DEPENDS+=	tcl>=8.3.2:../../lang/tcl83
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/devel/swig/Makefile b/devel/swig/Makefile
index 9e083a434b4..66625edde91 100644
--- a/devel/swig/Makefile
+++ b/devel/swig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 19:52:51 minskim Exp $
 
 DISTNAME=       swig1.1p5
 PKGNAME=	swig-1.1p5
@@ -16,6 +16,6 @@ GNU_CONFIGURE=	YES
 .include "../../lang/python/pyversion.mk"
 
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index e8ee040d31c..0ff43c7a80d 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=	tuxracer-0.61
@@ -32,7 +32,7 @@ post-install:
 
 .include "../../audio/SDL_mixer/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index 52d23b3f95a..e9d64a19e31 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/08 19:52:51 minskim Exp $
 
 DISTNAME=		igmt_v1.2
 PKGNAME=		iGMT-1.2
@@ -11,7 +11,7 @@ HOMEPAGE=		http://op.gfz-potsdam.de/igmt/
 COMMENT=		Interactive Mapping of Geoscientific Datasets
 
 DEPENDS+=		GMT>=3.3.6:../../graphics/GMT
-DEPENDS+=		tcl>=8.0:../../lang/tcl
+DEPENDS+=		tcl>=8.0:../../lang/tcl83
 DEPENDS+=		tk>=8.0:../../x11/tk
 DEPENDS+=		gv-[0-9]*:../../print/gv
 DEPENDS+=		ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
diff --git a/graphics/impress/Makefile b/graphics/impress/Makefile
index 9a5b06fa820..b6112c7ff13 100644
--- a/graphics/impress/Makefile
+++ b/graphics/impress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=	imp1.1b9
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.ntlug.org/~ccox/impress/
 COMMENT=	WYSIWYG vector graphics application
 
 DEPENDS+=	pstoedit>=3.19:../../graphics/pstoedit
-DEPENDS+=	tcl>=8.3.2nb2:../../lang/tcl
+DEPENDS+=	tcl>=8.3.2nb2:../../lang/tcl83
 DEPENDS+=	tk>=8.3.2nb1:../../x11/tk
 
 WRKSRC=		${WRKDIR}/impress-1.1b9
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index f5c664a0e9e..ce01c4293cc 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:43 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2004/03/08 19:52:51 minskim Exp $
 
 DISTNAME=		plplot-5.2.1
 CATEGORIES=		graphics
@@ -63,6 +63,6 @@ post-install:
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../devel/libtool/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/Makefile b/lang/Makefile
index 119a8279cc6..d1e35a7dcd8 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2004/03/07 17:18:58 minskim Exp $
+# $NetBSD: Makefile,v 1.167 2004/03/08 19:52:51 minskim Exp $
 #
 
 COMMENT=	Programming languages
@@ -134,6 +134,7 @@ SUBDIR+=	sun-jre13
 SUBDIR+=	sun-jre14
 SUBDIR+=	swi-prolog
 SUBDIR+=	tcl
+SUBDIR+=	tcl83
 SUBDIR+=	tcl-expect
 SUBDIR+=	tcl-itcl
 SUBDIR+=	tcl-otcl
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 2cdce6bdd57..c26cba81892 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:44 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:52:51 minskim Exp $
 
 DISTNAME=		smalltalk-2.1.4
 CATEGORIES=		lang
@@ -34,7 +34,7 @@ TEST_TARGET=		check
 .include "../../devel/gmp/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
 .include "../../databases/gdbm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index d374151e754..e4d9b6b8731 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/21 16:54:07 martti Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:52:51 minskim Exp $
 #
 
 .include "Makefile.common"
@@ -9,7 +9,7 @@ CATEGORIES=	lang
 MAINTAINER=	jwise@NetBSD.org
 COMMENT=	Extensions to Tcl to support scripting of interactive programs
 
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
+DEPENDS+=	tcl>=8.3.2:../../lang/tcl83
 
 CONFLICTS+=	expect-[0-9]*
 
diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile
index acb5328a03b..fee49b3504d 100644
--- a/lang/tcl-itcl/Makefile
+++ b/lang/tcl-itcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:45:30 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 19:52:51 minskim Exp $
 
 DISTNAME=	itcl3.2
 PKGNAME=	tcl-itcl-3.2
@@ -27,16 +27,16 @@ post-extract:
 	@${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/menubar.n 		\
 		${WRKSRC}/iwidgets2.2.0/doc/itclmenubar.n
 	@if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then	\
-		cd ../../lang/tcl && ${MAKE} extract;			\
+		cd ../../lang/tcl83 && ${MAKE} extract;			\
 	fi
 	@if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4 ]; then	\
 		cd ../../x11/tk && ${MAKE} extract;			\
 	fi
 
 pre-clean:
-	@cd ../../lang/tcl && ${MAKE} clean
+	@cd ../../lang/tcl83 && ${MAKE} clean
 	@cd ../../x11/tk && ${MAKE} clean
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-itcl/buildlink2.mk b/lang/tcl-itcl/buildlink2.mk
index 8bb78b51354..978b9c81748 100644
--- a/lang/tcl-itcl/buildlink2.mk
+++ b/lang/tcl-itcl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/25 09:13:49 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/08 19:52:51 minskim Exp $
 #
 
 .if !defined(TCL_ITCL_BUILDLINK2_MK)
@@ -339,7 +339,7 @@ BUILDLINK_FILES.tcl-itcl+=	lib/tcl/iwidgets3.0.1/scripts/toolbar.itk
 BUILDLINK_FILES.tcl-itcl+=	lib/tcl/iwidgets3.0.1/scripts/unknownimage.gif
 BUILDLINK_FILES.tcl-itcl+=	lib/tcl/iwidgets3.0.1/scripts/watch.itk
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	tcl-itcl-buildlink
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 20be60b9bb8..f071432dbfb 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:19:18 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -29,7 +29,7 @@ MAKE_ENV+=		GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
 post-extract:
 	@${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
 	@if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then	\
-		cd ../../lang/tcl && ${MAKE} extract;			\
+		cd ../../lang/tcl83 && ${MAKE} extract;			\
 	fi
 
 post-build:
@@ -45,7 +45,7 @@ post-install:
 # so...
 
 pre-clean:
-	@cd ../../lang/tcl && ${MAKE} clean
+	@cd ../../lang/tcl83 && ${MAKE} clean
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index a7f426dbde2..e718da30b9a 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:19:18 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -37,14 +37,14 @@ PATCHDIR=	${.CURDIR}/../../lang/tcl-tclX/patches
 post-extract:
 	${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
 	@if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then	\
-		cd ../../lang/tcl && ${MAKE} extract;			\
+		cd ../../lang/tcl83 && ${MAKE} extract;			\
 	fi
 	@if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4 ]; then	\
 		cd ../../x11/tk && ${MAKE} extract;			\
 	fi
 
 pre-clean:
-	@cd ../../lang/tcl && ${MAKE} clean
+	@cd ../../lang/tcl83 && ${MAKE} clean
 	@cd ../../x11/tk && ${MAKE} clean
 
 do-build:
diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile
index cf7e7799871..1bce157c409 100644
--- a/net/tcl-scotty/Makefile
+++ b/net/tcl-scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:22:22 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=	scotty-${DIST_VERS}
@@ -11,7 +11,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://wwwhome.cs.utwente.nl/~schoenw/scotty/
 COMMENT=	Network management extensions to TCL
 
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
+DEPENDS+=	tcl>=8.3.2:../../lang/tcl83
 
 DIST_VERS=	2.1.11
 
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index bbd17a7043e..3f5dd80c005 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/23 21:47:50 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 19:52:51 minskim Exp $
 
 .include "../pdflib/Makefile.common"
 
@@ -30,6 +30,6 @@ do-install:
 .endfor
 
 .include "../pdflib/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index f681c201f1f..0929b4ea7b3 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 15:00:22 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=		zebedee-2.3.1
@@ -20,7 +20,7 @@ MAKE_FLAGS=		OS=${LOWER_OPSYS}
 
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tkdesk/Makefile b/sysutils/tkdesk/Makefile
index 83978bff221..ac1d2d154c3 100644
--- a/sysutils/tkdesk/Makefile
+++ b/sysutils/tkdesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/27 00:53:10 heinz Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=	tkdesk-1.2
@@ -21,7 +21,7 @@ pre-install:
 	${FIND} ${WRKSRC}/tcldesk -type f -name '*.orig' -print | ${XARGS} ${RM} -rf
 	${FIND} ${WRKSRC}/tcldesk -name '*' -exec ${TOUCH} {} ';'
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../lang/tcl-itcl/buildlink2.mk"
 .include "../../x11/blt/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
diff --git a/textproc/tcl-expat/Makefile b/textproc/tcl-expat/Makefile
index ce4dd4d929d..08eb01c40b2 100644
--- a/textproc/tcl-expat/Makefile
+++ b/textproc/tcl-expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:54:52 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=	TclExpat-1.1
@@ -10,7 +10,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.zveno.com/zm.cgi/in-tclxml/
 COMMENT=	XML parser implemented entirely in Tcl
 
-DEPENDS+=       tcl>=8.3.2:../../lang/tcl
+DEPENDS+=       tcl>=8.3.2:../../lang/tcl83
 DEPENDS+=	expat-[0-9]*:../../textproc/expat
 
 pre-install:
diff --git a/textproc/tcl-xml/Makefile b/textproc/tcl-xml/Makefile
index e2550dd449d..b9ae2ebeefa 100644
--- a/textproc/tcl-xml/Makefile
+++ b/textproc/tcl-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:52 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=	TclXML-1.2
@@ -10,7 +10,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.zveno.com/zm.cgi/in-tclxml/
 COMMENT=	XML parser implemented entirely in Tcl
 
-DEPENDS+=       tcl>=8.3.2:../../lang/tcl
+DEPENDS+=       tcl>=8.3.2:../../lang/tcl83
 
 # old name for this package...
 CONFLICTS+=	TclXML-[0-9]*
diff --git a/www/ap-aolserver/Makefile b/www/ap-aolserver/Makefile
index 2bcb3567c97..bd6b6e64575 100644
--- a/www/ap-aolserver/Makefile
+++ b/www/ap-aolserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/11/26 16:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/08 19:52:51 minskim Exp $
 #
 
 DISTNAME=		mod_aolserver-1.1
@@ -30,6 +30,6 @@ post-install:
 
 .include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../devel/libmm/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../www/apache/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index 40dbb41f304..b0d93bed6b9 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/20 12:27:58 agc Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/08 19:52:52 minskim Exp $
 
 DISTNAME=	mod_dtcl-0.11.6
 PKGNAME=	ap-dtcl-0.11.2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://tcl.apache.org/
 COMMENT=	Simple, fast Tcl server side scripting for apache
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-DEPENDS+=	tcl>=8.3.2nb2:../../lang/tcl
+DEPENDS+=	tcl>=8.3.2nb2:../../lang/tcl83
 
 WRKSRC=		${WRKDIR}/mod_dtcl
 TCLSH=		${LOCALBASE}/bin/tclsh
diff --git a/www/tcl-cgi/Makefile b/www/tcl-cgi/Makefile
index a5bbf493a37..6bf81832b7b 100644
--- a/www/tcl-cgi/Makefile
+++ b/www/tcl-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:00 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:52:52 minskim Exp $
 #
 
 DISTNAME=	cgi.tcl
@@ -10,7 +10,7 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://expect.nist.gov/cgi.tcl/
 COMMENT=	Library of Tcl procedures to assist in writing CGI scripts
 
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
+DEPENDS+=	tcl>=8.3.2:../../lang/tcl83
 
 WRKSRC=		${WRKDIR}/cgi.tcl-1.3
 DIST_SUBDIR=	${PKGNAME}
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index 9b17a2583b3..d3f67b82570 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/02/06 19:04:25 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2004/03/08 19:52:52 minskim Exp $
 
 DISTNAME=		XF86Setup-3.3.6
 PKGREVISION=		1
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.xfree86.org/
 COMMENT=		Graphical configuration tool for XFree86
 
-BUILD_DEPENDS= 		tcl>=8.3.2:../../lang/tcl
+BUILD_DEPENDS= 		tcl>=8.3.2:../../lang/tcl83
 BUILD_DEPENDS+=		tk>=8.3.2:../../x11/tk
 
 ONLY_FOR_PLATFORM=	*-*-i386
diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index b319c982adc..c3da48e058b 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/06 06:26:21 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:52:52 minskim Exp $
 #
 
 DISTNAME=	BLT2.4z
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
 MAKE_ENV+=		CP=${CP}
 
-.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/blt/buildlink2.mk b/x11/blt/buildlink2.mk
index 0d568763175..11d8f12f5d5 100644
--- a/x11/blt/buildlink2.mk
+++ b/x11/blt/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/08 01:48:54 kristerw Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/08 19:52:52 minskim Exp $
 #
 # This Makefile fragment is included by packages that use blt.
 #
@@ -25,7 +25,7 @@ BUILDLINK_FILES.blt+=	include/bltVector.h
 BUILDLINK_FILES.blt+=	lib/libBLT.*
 BUILDLINK_FILES.blt+=	lib/libBLT24.*
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	blt-buildlink
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk
index c84d17491b5..6cfaa74aa33 100644
--- a/x11/blt/buildlink3.mk
+++ b/x11/blt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/07 00:32:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/08 19:52:52 minskim Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BLT_BUILDLINK3_MK:=	${BLT_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	blt
 BUILDLINK_DEPENDS.blt+=		blt>=2.4o
 BUILDLINK_PKGSRCDIR.blt?=	../../x11/blt
 
-.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
 .endif	# BLT_BUILDLINK3_MK
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile
index ebfc8c0cb05..103611d416a 100644
--- a/x11/py-Tk/Makefile
+++ b/x11/py-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/07/28 09:23:55 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2004/03/08 19:52:52 minskim Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-Tk-0
@@ -32,7 +32,7 @@ do-patch:
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile
index adc4d436a8b..8909cdd9fcd 100644
--- a/x11/ruby-tcltklib/Makefile
+++ b/x11/ruby-tcltklib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 19:52:52 minskim Exp $
 # FreeBSD: ports/lang/ruby-tcltklib/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.ruby-lang.org/en/
 COMMENT=	Ruby interface to Tcl/Tk libraries
 
-DEPENDS+=	tcl>=8.3:../../lang/tcl
+DEPENDS+=	tcl>=8.3:../../lang/tcl83
 DEPENDS+=	tk>=8.3:../../x11/tk
 
 WRKSRC=		${RUBY_WRKSRC}/ext/tcltklib
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 0f75cf39cee..56b24363895 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/02/09 23:19:27 minskim Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/08 19:52:52 minskim Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
@@ -85,5 +85,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixInt.h ${PREFIX}/include/tk/unix
 	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix
 
-.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/buildlink2.mk b/x11/tk/buildlink2.mk
index e9ae7a70582..dcd5013de4a 100644
--- a/x11/tk/buildlink2.mk
+++ b/x11/tk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/09 14:04:07 agc Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/03/08 19:52:52 minskim Exp $
 
 .if !defined(TK_BUILDLINK2_MK)
 TK_BUILDLINK2_MK=	# defined
@@ -20,7 +20,7 @@ BUILDLINK_FILES.tk+=		lib/libtkstub83.*
 
 USE_X11=	YES
 
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl83/buildlink2.mk"
 
 # Make "-ltk" resolve into "-ltk83", so that we don't need to patch so
 # many Makefiles.
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 083e749f96b..62822515756 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/08 19:52:52 minskim Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ BUILDLINK_TRANSFORM+=	l:tk:tk83
 USE_X11=	yes
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
-.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
 
 .endif	# TK_BUILDLINK3_MK