19 files changed, 47 insertions, 47 deletions

diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 2a795ba0922b..05865c9d7b21 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -3,7 +3,7 @@
 # Whom:			pst
 # Version required:	5.26
 #
-# $Id: Makefile,v 1.31 1998/05/25 20:00:59 steve Exp $
+# $Id: Makefile,v 1.32 1998/06/28 23:25:51 steve Exp $
 #
 # Note this file is included from japanese/extract/Makefile
 
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://peloton.physics.montana.edu/pub/distfiles/
 
 MAINTAINER=	ports@freebsd.org
 
-LIB_DEPENDS?=	tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS?=	tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?= --enable-shared \
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 1fc09decdd28..8845def09639 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.36 1998/07/23 07:49:12 tg Exp $
+# $Id: Makefile,v 1.37 1998/07/28 06:59:45 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -46,7 +46,7 @@ SETUP_FILE=	Setup
 #
 WITH_TK?=	yes
 .if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+TK_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 SETUP_LOCAL=	Setup.tk
 .endif
 
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 133985f4b92d..9f6d067ca124 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.21 1998/05/21 01:36:22 jseger Exp $
+# $Id: Makefile,v 1.22 1998/07/27 21:36:04 hoek Exp $
 #
 
 DISTNAME=	tclX8.0.2
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 
 MAINTAINER=	jseger@FreeBSD.ORG
 
-LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
@@ -29,10 +29,10 @@ post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
 	${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
-	${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+	${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
 .endif
 
 .include <bsd.port.mk>
 
-PKG_ARGS+=      -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+=      -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 133985f4b92d..9f6d067ca124 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.21 1998/05/21 01:36:22 jseger Exp $
+# $Id: Makefile,v 1.22 1998/07/27 21:36:04 hoek Exp $
 #
 
 DISTNAME=	tclX8.0.2
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 
 MAINTAINER=	jseger@FreeBSD.ORG
 
-LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
@@ -29,10 +29,10 @@ post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
 	${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
-	${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+	${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
 .endif
 
 .include <bsd.port.mk>
 
-PKG_ARGS+=      -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+=      -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index 133985f4b92d..9f6d067ca124 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.21 1998/05/21 01:36:22 jseger Exp $
+# $Id: Makefile,v 1.22 1998/07/27 21:36:04 hoek Exp $
 #
 
 DISTNAME=	tclX8.0.2
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 
 MAINTAINER=	jseger@FreeBSD.ORG
 
-LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
@@ -29,10 +29,10 @@ post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
 	${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11/tk80/pkg/INSTALL.wish)
-	${SH} ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
+	${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
 .endif
 
 .include <bsd.port.mk>
 
-PKG_ARGS+=      -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+=      -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish