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.

4 files changed, 8 insertions, 8 deletions

diff --git a/cad/mpac/Makefile b/cad/mpac/Makefile
index c6a992e3a43..c81eff70854 100644
--- a/cad/mpac/Makefile
+++ b/cad/mpac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:12 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/08 20:27:13 minskim Exp $
 #
 
 DISTNAME=	mpac-0.2.2
@@ -9,7 +9,7 @@ MASTER_SITES=	http://goemon.polito.it/ftp/pub/software/lethal/Elettronica/antenn
 MAINTAINER=	dmcmahill@NetBSD.org
 COMMENT=	Microstrip Patch Antenna Calculator
 
-DEPENDS+=	tk>=8.1:../../x11/tk
+DEPENDS+=	tk>=8.1:../../x11/tk83
 
 do-build:
 	${SED} 's;patch.gif;${PREFIX}/share/mpac/patch.gif;g' ${WRKSRC}/mpac.tcl > ${WRKSRC}/mpac
diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile
index 834f2985a92..7a2f05c9304 100644
--- a/cad/pcb-current/Makefile
+++ b/cad/pcb-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/15 23:14:25 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/08 20:27:13 minskim Exp $
 #
 
 DISTNAME=	pcb-${SNAPDATE}
@@ -12,7 +12,7 @@ COMMENT=	Printed circuit board layout system (development snapshot version)
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 DEPENDS+=	m4>=1.4:../../devel/m4
-DEPENDS+=	tk>=8.3:../../x11/tk
+DEPENDS+=	tk>=8.3:../../x11/tk83
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 0fc6d6714cb..a733c6048bc 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/25 03:08:46 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 20:27:13 minskim Exp $
 #
 
 DISTNAME=	tkgate-1.6i
@@ -33,5 +33,5 @@ do-configure:
 	${ECHO} "${TKGATE_SITENAME}" > ${WRKSRC}/sitename.txt
 	( cd ${WRKSRC} && ${CONFIGURE_ENV} ./configure )
 
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 9d058f24cc6..d71c492635d 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/08 19:52:50 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/08 20:27:13 minskim Exp $
 
 DISTNAME=	xcircuit-3.1.19
 CATEGORIES=	cad graphics
@@ -31,7 +31,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit/
 
 .include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 .include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"