Enable tk84 and replace x11/tk with x11/tk83. Packages compatible

with 8.4 will be updated to depend on x11/tk after Tk update.

6 files changed, 12 insertions, 12 deletions

diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 44974cecd47..ace054bdd9b 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:43:16 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 20:27:14 minskim Exp $
 #
 
 DISTNAME=       cbrowser-0.6
@@ -25,5 +25,5 @@ do-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/$$f ${PREFIX}/share/cbrowser; \
 	done
 
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index 6913f86210f..45cd6b5d232 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 20:27:14 minskim Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
@@ -62,6 +62,6 @@ do-install:
 	cd ${WRKSRC} && ${PAX} -s ,^./[.].*,, -rw . ${PREFIX}/pvs
 	${CHMOD} 755 ${PREFIX}/pvs/pvs
 
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 .include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/tcl-tclcl/Makefile b/devel/tcl-tclcl/Makefile
index 96e70460240..4d04cd2a2d6 100644
--- a/devel/tcl-tclcl/Makefile
+++ b/devel/tcl-tclcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:14 minskim Exp $
 
 DISTNAME=	tclcl-src-1.0b13
 PKGNAME=	tcl-${DISTNAME:S/b/rc/:S/-src//}
@@ -21,5 +21,5 @@ CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.tcl}/include/tcl/generic
 
 .include  "../../lang/tcl-otcl/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/tcl-tclcl/buildlink2.mk b/devel/tcl-tclcl/buildlink2.mk
index 89c162671ab..9c43ceca623 100644
--- a/devel/tcl-tclcl/buildlink2.mk
+++ b/devel/tcl-tclcl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/08/28 10:00:11 seb Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/08 20:27:14 minskim Exp $
 
 .if !defined(TCL_TCLCL_BUILDLINK2_MK)
 TCL_TCLCL_BUILDLINK2_MK=	# defined
@@ -21,7 +21,7 @@ BUILDLINK_FILES.tcl-tclcl+=		include/tracedvar.h
 BUILDLINK_FILES.tcl-tclcl+=		lib/libtclcl.*
 
 .include  "../../lang/tcl-otcl/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 
 BUILDLINK_TARGETS+=		tcl-tclcl-buildlink
 
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 0fa2ebbfb67..492cadd2c59 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/07/17 21:34:09 grant Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/08 20:27:14 minskim Exp $
 #
 
 DISTNAME=	tkcvs_7_1_2
@@ -21,5 +21,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkcvs
 	${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/
 
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/tkdiff/Makefile b/devel/tkdiff/Makefile
index 56bc93308ba..34c3f401daa 100644
--- a/devel/tkdiff/Makefile
+++ b/devel/tkdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/16 16:34:02 recht Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/08 20:27:14 minskim Exp $
 #
 
 DISTNAME=	tkdiff_3_09
@@ -11,7 +11,7 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.accurev.com/free/tkdiff/
 COMMENT=	Graphical 2-way diff/merge tool
 
-DEPENDS+=	tk>=8.3.2:../../x11/tk
+DEPENDS+=	tk>=8.3.2:../../x11/tk83
 
 NO_BUILD=	yes
 NO_CONFIGURE=	yes