From 3bb1fc8f69e62ed958608937f6fca6141879581c Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Mon, 8 Mar 2004 20:27:13 +0000
Subject: 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.

---
 graphics/cqcam/Makefile         | 4 ++--
 graphics/graphviz/Makefile      | 4 ++--
 graphics/graphviz/buildlink2.mk | 4 ++--
 graphics/iGMT/Makefile          | 4 ++--
 graphics/impress/Makefile       | 4 ++--
 graphics/plplot/Makefile        | 4 ++--
 graphics/tkpiechart/Makefile    | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'graphics')

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 7c0e49d69c4..6430d1356b2 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:40:17 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/08 20:27:14 minskim Exp $
 #
 
 DISTNAME=		cqcam-0.45a
@@ -18,5 +18,5 @@ USE_BUILDLINK2=		YES
 USE_X11=		YES
 
 .include "../../graphics/jpeg/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 59300acdaee..2526a5050ad 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/24 14:29:34 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/08 20:27:14 minskim Exp $
 #
 
 DISTNAME=	graphviz-1.10
@@ -78,7 +78,7 @@ post-install:
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 # .include "../../www/curl/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 .include "../../mk/xaw.buildlink2.mk"
diff --git a/graphics/graphviz/buildlink2.mk b/graphics/graphviz/buildlink2.mk
index a5158575669..9ebe41fa96c 100644
--- a/graphics/graphviz/buildlink2.mk
+++ b/graphics/graphviz/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/28 10:06:44 seb Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/03/08 20:27:14 minskim Exp $
 #
 # This Makefile fragment is included by packages that use graphviz.
 #
@@ -21,7 +21,7 @@ BUILDLINK_FILES.graphviz+=	lib/graphviz/*
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	graphviz-buildlink
 
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index e9d64a19e31..b5c010b2e3a 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/08 20:27:14 minskim Exp $
 
 DISTNAME=		igmt_v1.2
 PKGNAME=		iGMT-1.2
@@ -12,7 +12,7 @@ COMMENT=		Interactive Mapping of Geoscientific Datasets
 
 DEPENDS+=		GMT>=3.3.6:../../graphics/GMT
 DEPENDS+=		tcl>=8.0:../../lang/tcl83
-DEPENDS+=		tk>=8.0:../../x11/tk
+DEPENDS+=		tk>=8.0:../../x11/tk83
 DEPENDS+=		gv-[0-9]*:../../print/gv
 DEPENDS+=		ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
 
diff --git a/graphics/impress/Makefile b/graphics/impress/Makefile
index b6112c7ff13..3851964b983 100644
--- a/graphics/impress/Makefile
+++ b/graphics/impress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:14 minskim Exp $
 #
 
 DISTNAME=	imp1.1b9
@@ -13,7 +13,7 @@ COMMENT=	WYSIWYG vector graphics application
 
 DEPENDS+=	pstoedit>=3.19:../../graphics/pstoedit
 DEPENDS+=	tcl>=8.3.2nb2:../../lang/tcl83
-DEPENDS+=	tk>=8.3.2nb1:../../x11/tk
+DEPENDS+=	tk>=8.3.2nb1:../../x11/tk83
 
 WRKSRC=		${WRKDIR}/impress-1.1b9
 
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index ce01c4293cc..5a035af4556 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.34 2004/03/08 20:27:14 minskim Exp $
 
 DISTNAME=		plplot-5.2.1
 CATEGORIES=		graphics
@@ -62,7 +62,7 @@ post-install:
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../devel/libtool/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
 .include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile
index 8ad732aae98..d9491026eab 100644
--- a/graphics/tkpiechart/Makefile
+++ b/graphics/tkpiechart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:42:52 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 20:27:14 minskim Exp $
 
 DISTNAME=	tkpiechart-5.4
 CATEGORIES=	graphics
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://jfontain.free.fr/
 COMMENT=	Tcl/Tk pie-chart utility; in Tcl, not as an extension
 
-DEPENDS+=	tk>=8.3.2:../../x11/tk
+DEPENDS+=	tk>=8.3.2:../../x11/tk83
 DEPENDS+=	stooop>=3.7:../../devel/stooop
 
 NO_CONFIGURE=	yes
-- 
cgit v1.2.3