15 files changed, 38 insertions, 38 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 75ff72f089f8..784826a278b1 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 July 1998
 # Whom:			Kenjiro Cho <kjc@csl.sony.co.jp>
 #
-# $Id: Makefile,v 1.17 1998/07/12 17:40:31 kjc Exp $
+# $Id: Makefile,v 1.18 1998/08/07 22:56:37 asami Exp $
 #
 
 DISTNAME=	BLT2.4c
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.tcltk.com/pub/blt/
 
 MAINTAINER=	kjc@csl.sony.co.jp
 
-LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/blt2.4c
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 1ba9ac7b746a..9c2d93e367a8 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 Oct 1997
 # Whom:	      		Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.10 1998/08/06 15:06:24 vanilla Exp $
+# $Id: Makefile,v 1.11 1998/08/07 23:08:38 asami Exp $
 #
 
 DISTNAME=	Gtk-0.2.2
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	Gtk
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
 
 USE_PERL5=	YES
 
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index 57cfe679a40b..7e92c9edef9d 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.5 1998/02/21 22:38:03 fenner Exp $
+#   $Id: Makefile,v 1.6 1998/08/07 23:08:39 asami Exp $
 
 DISTNAME=	TclTk-b1
 PKGNAME=	p5-Tcl-Tk-b1
@@ -15,7 +15,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
 RUN_DEPENDS=	perl5.00401:${PORTSDIR}/lang/perl5
-LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11-toolkits/tk41
 
 BROKEN=		tcl
 
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index 57cfe679a40b..7e92c9edef9d 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.5 1998/02/21 22:38:03 fenner Exp $
+#   $Id: Makefile,v 1.6 1998/08/07 23:08:39 asami Exp $
 
 DISTNAME=	TclTk-b1
 PKGNAME=	p5-Tcl-Tk-b1
@@ -15,7 +15,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
 RUN_DEPENDS=	perl5.00401:${PORTSDIR}/lang/perl5
-LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11-toolkits/tk41
 
 BROKEN=		tcl
 
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 4d7115136d98..3f3fb450d28b 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.15 1998/08/07 12:01:21 markm Exp $
+# $Id: Makefile,v 1.16 1998/08/07 23:08:39 asami Exp $
 #
 
 DISTNAME=	Tk800.008
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	Tk
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 #BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/HTML/Parse.pm:${PORTSDIR}/www/p5-libwww
-LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 
 USE_PERL5=	YES
 
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 42a8069cc553..922f8a8086b5 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:56:38 asami Exp $
 #
 
 DISTNAME=	pygtk-0.4.5
@@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
 
 BROKEN=		glib.h
 
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 42a8069cc553..922f8a8086b5 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:56:38 asami Exp $
 #
 
 DISTNAME=	pygtk-0.4.5
@@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
 
 BROKEN=		glib.h
 
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 42a8069cc553..922f8a8086b5 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:56:38 asami Exp $
 #
 
 DISTNAME=	pygtk-0.4.5
@@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
 
 BROKEN=		glib.h
 
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 42a8069cc553..922f8a8086b5 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/07 22:56:38 asami Exp $
 #
 
 DISTNAME=	pygtk-0.4.5
@@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11/gtk
+LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
 
 BROKEN=		glib.h
 
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index c383fc0101b8..8572dcab14dc 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -3,7 +3,7 @@
 # Date created:        5 March 1997
 # Whom:                Pedro Giffuni
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:31:48 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/07 22:56:39 asami Exp $
 #
 
 DISTNAME=	SlingShot2.1
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	giffunip@asme.org
 
-LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
 
 WRKSRC=		$(WRKDIR)/sspkg2.1
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 8546beee4b17..8ec0c91e6ed7 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp $
+# $Id: Makefile,v 1.16 1998/08/07 22:56:40 asami Exp $
 #
 
 DISTNAME=	Tix4.1.0.006
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.xpi.com/pub/
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/Tix4.1.0/unix/tk8.0
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 0d9aae32eaa9..49a22f39db4e 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
+# $Id: Makefile,v 1.14 1998/08/07 22:56:47 asami Exp $
 #
 
 DISTNAME=	tk8.1a2
@@ -23,8 +23,8 @@ CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
 post-install:
 	${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
 
 test:
@@ -32,4 +32,4 @@ test:
 
 .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/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 0d9aae32eaa9..49a22f39db4e 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
+# $Id: Makefile,v 1.14 1998/08/07 22:56:47 asami Exp $
 #
 
 DISTNAME=	tk8.1a2
@@ -23,8 +23,8 @@ CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
 post-install:
 	${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
 
 test:
@@ -32,4 +32,4 @@ test:
 
 .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/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 0d9aae32eaa9..49a22f39db4e 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
+# $Id: Makefile,v 1.14 1998/08/07 22:56:47 asami Exp $
 #
 
 DISTNAME=	tk8.1a2
@@ -23,8 +23,8 @@ CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
 post-install:
 	${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
 
 test:
@@ -32,4 +32,4 @@ test:
 
 .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/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index d0d6a09ba309..b3751b1a495a 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 November 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1998/07/27 21:36:08 hoek Exp $
+# $Id: Makefile,v 1.11 1998/08/07 22:56:47 asami Exp $
 #
 
 DISTNAME=	tk8.0p2
@@ -39,8 +39,8 @@ post-install:
 		${PREFIX}/share/doc/tkstep
 .endif
 	${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
 
 test:
@@ -48,4 +48,4 @@ test:
 
 .include <bsd.port.mk>
 
-PKG_ARGS+=      -i ${PORTSDIR}/x11/tk80/pkg/INSTALL.wish
+PKG_ARGS+=      -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish